diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 4fc7d3c5c02..f7dc0e32a67 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/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/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 9e70025c019..649c9e544e4 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/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/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java index eea8bc8cd4f..77d283f12d3 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java +++ b/jps/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/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 896dbdd010d..72c7dff31e4 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/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/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index 2b29dff9834..865585c9c52 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps/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/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index b4264cd694a..f8d4f8cec66 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/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/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index 1ea148f1be4..5109411ef0a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/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/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 920df5bb0b2..1ec16d5065e 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/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/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index b407aecbd46..5160563c68c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/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/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index d6a6ae7a97d..6a90f0cbdb7 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/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/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index ccc56bb75a3..7a9f6cfc73b 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/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/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java index 8c53fb95d41..b6198737e3e 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java +++ b/jps/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); } }