From 8fcd98639d29ed0d5e8420e60d2e39878d61cfa5 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Thu, 16 Jan 2020 16:30:45 +0300 Subject: [PATCH] Minor: merge HierarchicalExpectActualMatchingTests into MultiplatformHighlightingTests --- .../kotlin/generators/tests/GenerateTests.kt | 4 - .../diamondActualInBottom/bottom/bottom.kt | 0 .../diamondActualInBottom/dependencies.txt | 0 .../diamondActualInBottom/left/left.kt | 0 .../diamondActualInBottom/right/right.kt | 0 .../diamondActualInBottom/top/top.kt | 0 .../diamondActualOnOnePath/bottom/bottom.kt | 0 .../diamondActualOnOnePath/dependencies.txt | 0 .../diamondActualOnOnePath/left/left.kt | 0 .../diamondActualOnOnePath/right/right.kt | 0 .../diamondActualOnOnePath/top/top.kt | 0 .../diamondDuplicateActuals/bottom/bottom.kt | 0 .../diamondDuplicateActuals/dependencies.txt | 0 .../diamondDuplicateActuals/left/left.kt | 0 .../diamondDuplicateActuals/right/right.kt | 0 .../diamondDuplicateActuals/top/top.kt | 0 .../diamondSeesTwoActuals/bottom/bottom.kt | 0 .../diamondSeesTwoActuals/dependencies.txt | 0 .../diamondSeesTwoActuals/left/left.kt | 0 .../diamondSeesTwoActuals/right/right.kt | 0 .../diamondSeesTwoActuals/top/top.kt | 0 .../a-common/a.kt | 0 .../differentKindsOfDependencies/a-js/js.kt | 0 .../differentKindsOfDependencies/a-jvm/jvm.kt | 0 .../b-common/b.kt | 0 .../dependencies.txt | 0 .../duplicateActualsExplicit/bottom/bottom.kt | 0 .../duplicateActualsExplicit/dependencies.txt | 0 .../duplicateActualsExplicit/middle/middle.kt | 0 .../duplicateActualsExplicit/top/top.kt | 0 .../duplicateActualsImplicit/bottom/bottom.kt | 0 .../duplicateActualsImplicit/dependencies.txt | 0 .../duplicateActualsImplicit/middle/middle.kt | 0 .../duplicateActualsImplicit/top/top.kt | 0 .../bottom/bottom.kt | 0 .../dependencies.txt | 0 .../middle/middle.kt | 0 .../top/top.kt | 0 .../bottom/bottom.kt | 0 .../dependencies.txt | 0 .../middle/middle.kt | 0 .../top/top.kt | 0 .../duplicateExpectsExplicit/bottom/bottom.kt | 0 .../duplicateExpectsExplicit/dependencies.txt | 0 .../duplicateExpectsExplicit/left/left.kt | 0 .../duplicateExpectsExplicit/right/right.kt | 0 .../duplicateExpectsImplicit/bottom/bottom.kt | 0 .../duplicateExpectsImplicit/dependencies.txt | 0 .../duplicateExpectsImplicit/left/left.kt | 0 .../duplicateExpectsImplicit/right/right.kt | 0 .../bottom/bottom.kt | 0 .../dependencies.txt | 0 .../left/left.kt | 0 .../right/right.kt | 0 .../hierarcicalActualization/common/common.kt | 0 .../hierarcicalActualization/dependencies.txt | 0 .../hierarcicalActualization/js/js.kt | 0 .../hierarcicalActualization/jvm/jvm.kt | 0 .../jvmAndJs/jvmAndJs.kt | 0 .../incompleteActualization/common/common.kt | 0 .../incompleteActualization/dependencies.txt | 0 .../incompleteActualization/js/js.kt | 0 .../incompleteActualization/jvm/jvm.kt | 0 .../jvmAndJs/jvmAndJs.kt | 0 .../bottom/bottom.kt | 0 .../dependencies.txt | 0 .../middle/middle.kt | 0 .../top/top.kt | 0 ...HierarchicalExpectActualTestGenerated.java | 105 ------------------ .../MultiplatformAnalysisTestGenerated.java | 75 +++++++++++++ 70 files changed, 75 insertions(+), 109 deletions(-) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondActualInBottom/bottom/bottom.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondActualInBottom/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondActualInBottom/left/left.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondActualInBottom/right/right.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondActualInBottom/top/top.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondActualOnOnePath/bottom/bottom.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondActualOnOnePath/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondActualOnOnePath/left/left.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondActualOnOnePath/right/right.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondActualOnOnePath/top/top.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondDuplicateActuals/bottom/bottom.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondDuplicateActuals/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondDuplicateActuals/left/left.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondDuplicateActuals/right/right.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondDuplicateActuals/top/top.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondSeesTwoActuals/bottom/bottom.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondSeesTwoActuals/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondSeesTwoActuals/left/left.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondSeesTwoActuals/right/right.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/diamondSeesTwoActuals/top/top.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/differentKindsOfDependencies/a-common/a.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/differentKindsOfDependencies/a-js/js.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/differentKindsOfDependencies/a-jvm/jvm.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/differentKindsOfDependencies/b-common/b.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/differentKindsOfDependencies/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsExplicit/bottom/bottom.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsExplicit/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsExplicit/middle/middle.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsExplicit/top/top.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsImplicit/bottom/bottom.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsImplicit/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsImplicit/middle/middle.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsImplicit/top/top.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsOneWeaklyIncompatible/bottom/bottom.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsOneWeaklyIncompatible/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsOneWeaklyIncompatible/middle/middle.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsOneWeaklyIncompatible/top/top.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsOneWithStrongIncompatibility/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateActualsOneWithStrongIncompatibility/top/top.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateExpectsExplicit/bottom/bottom.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateExpectsExplicit/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateExpectsExplicit/left/left.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateExpectsExplicit/right/right.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateExpectsImplicit/bottom/bottom.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateExpectsImplicit/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateExpectsImplicit/left/left.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateExpectsImplicit/right/right.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateExpectsWithStrongIncompatibility/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateExpectsWithStrongIncompatibility/left/left.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/duplicateExpectsWithStrongIncompatibility/right/right.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/hierarcicalActualization/common/common.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/hierarcicalActualization/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/hierarcicalActualization/js/js.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/hierarcicalActualization/jvm/jvm.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/hierarcicalActualization/jvmAndJs/jvmAndJs.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/incompleteActualization/common/common.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/incompleteActualization/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/incompleteActualization/js/js.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/incompleteActualization/jvm/jvm.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/incompleteActualization/jvmAndJs/jvmAndJs.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/weaklyIncompatibleActualInIntermediateModule/bottom/bottom.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/weaklyIncompatibleActualInIntermediateModule/dependencies.txt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt (100%) rename idea/testData/{multiModuleHighlighting/hierarchicalExpectActualMatching => multiplatform}/weaklyIncompatibleActualInIntermediateModule/top/top.kt (100%) delete mode 100644 idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HierarchicalExpectActualTestGenerated.java diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 4a3cd4ea23d..022d99e32e9 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -768,10 +768,6 @@ fun main(args: Array) { model("multiModuleHighlighting/multiplatform/", recursive = false, extension = null) } - testClass { - model("multiModuleHighlighting/hierarchicalExpectActualMatching/", recursive = false, extension = null) - } - testClass { model("multiplatform", recursive = false, extension = null) } diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualInBottom/bottom/bottom.kt b/idea/testData/multiplatform/diamondActualInBottom/bottom/bottom.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualInBottom/bottom/bottom.kt rename to idea/testData/multiplatform/diamondActualInBottom/bottom/bottom.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualInBottom/dependencies.txt b/idea/testData/multiplatform/diamondActualInBottom/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualInBottom/dependencies.txt rename to idea/testData/multiplatform/diamondActualInBottom/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualInBottom/left/left.kt b/idea/testData/multiplatform/diamondActualInBottom/left/left.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualInBottom/left/left.kt rename to idea/testData/multiplatform/diamondActualInBottom/left/left.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualInBottom/right/right.kt b/idea/testData/multiplatform/diamondActualInBottom/right/right.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualInBottom/right/right.kt rename to idea/testData/multiplatform/diamondActualInBottom/right/right.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualInBottom/top/top.kt b/idea/testData/multiplatform/diamondActualInBottom/top/top.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualInBottom/top/top.kt rename to idea/testData/multiplatform/diamondActualInBottom/top/top.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualOnOnePath/bottom/bottom.kt b/idea/testData/multiplatform/diamondActualOnOnePath/bottom/bottom.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualOnOnePath/bottom/bottom.kt rename to idea/testData/multiplatform/diamondActualOnOnePath/bottom/bottom.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualOnOnePath/dependencies.txt b/idea/testData/multiplatform/diamondActualOnOnePath/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualOnOnePath/dependencies.txt rename to idea/testData/multiplatform/diamondActualOnOnePath/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualOnOnePath/left/left.kt b/idea/testData/multiplatform/diamondActualOnOnePath/left/left.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualOnOnePath/left/left.kt rename to idea/testData/multiplatform/diamondActualOnOnePath/left/left.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualOnOnePath/right/right.kt b/idea/testData/multiplatform/diamondActualOnOnePath/right/right.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualOnOnePath/right/right.kt rename to idea/testData/multiplatform/diamondActualOnOnePath/right/right.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualOnOnePath/top/top.kt b/idea/testData/multiplatform/diamondActualOnOnePath/top/top.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualOnOnePath/top/top.kt rename to idea/testData/multiplatform/diamondActualOnOnePath/top/top.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondDuplicateActuals/bottom/bottom.kt b/idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondDuplicateActuals/bottom/bottom.kt rename to idea/testData/multiplatform/diamondDuplicateActuals/bottom/bottom.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondDuplicateActuals/dependencies.txt b/idea/testData/multiplatform/diamondDuplicateActuals/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondDuplicateActuals/dependencies.txt rename to idea/testData/multiplatform/diamondDuplicateActuals/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondDuplicateActuals/left/left.kt b/idea/testData/multiplatform/diamondDuplicateActuals/left/left.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondDuplicateActuals/left/left.kt rename to idea/testData/multiplatform/diamondDuplicateActuals/left/left.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondDuplicateActuals/right/right.kt b/idea/testData/multiplatform/diamondDuplicateActuals/right/right.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondDuplicateActuals/right/right.kt rename to idea/testData/multiplatform/diamondDuplicateActuals/right/right.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondDuplicateActuals/top/top.kt b/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondDuplicateActuals/top/top.kt rename to idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondSeesTwoActuals/bottom/bottom.kt b/idea/testData/multiplatform/diamondSeesTwoActuals/bottom/bottom.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondSeesTwoActuals/bottom/bottom.kt rename to idea/testData/multiplatform/diamondSeesTwoActuals/bottom/bottom.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondSeesTwoActuals/dependencies.txt b/idea/testData/multiplatform/diamondSeesTwoActuals/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondSeesTwoActuals/dependencies.txt rename to idea/testData/multiplatform/diamondSeesTwoActuals/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondSeesTwoActuals/left/left.kt b/idea/testData/multiplatform/diamondSeesTwoActuals/left/left.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondSeesTwoActuals/left/left.kt rename to idea/testData/multiplatform/diamondSeesTwoActuals/left/left.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondSeesTwoActuals/right/right.kt b/idea/testData/multiplatform/diamondSeesTwoActuals/right/right.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondSeesTwoActuals/right/right.kt rename to idea/testData/multiplatform/diamondSeesTwoActuals/right/right.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondSeesTwoActuals/top/top.kt b/idea/testData/multiplatform/diamondSeesTwoActuals/top/top.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondSeesTwoActuals/top/top.kt rename to idea/testData/multiplatform/diamondSeesTwoActuals/top/top.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/differentKindsOfDependencies/a-common/a.kt b/idea/testData/multiplatform/differentKindsOfDependencies/a-common/a.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/differentKindsOfDependencies/a-common/a.kt rename to idea/testData/multiplatform/differentKindsOfDependencies/a-common/a.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/differentKindsOfDependencies/a-js/js.kt b/idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/differentKindsOfDependencies/a-js/js.kt rename to idea/testData/multiplatform/differentKindsOfDependencies/a-js/js.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/differentKindsOfDependencies/a-jvm/jvm.kt b/idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/differentKindsOfDependencies/a-jvm/jvm.kt rename to idea/testData/multiplatform/differentKindsOfDependencies/a-jvm/jvm.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/differentKindsOfDependencies/b-common/b.kt b/idea/testData/multiplatform/differentKindsOfDependencies/b-common/b.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/differentKindsOfDependencies/b-common/b.kt rename to idea/testData/multiplatform/differentKindsOfDependencies/b-common/b.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/differentKindsOfDependencies/dependencies.txt b/idea/testData/multiplatform/differentKindsOfDependencies/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/differentKindsOfDependencies/dependencies.txt rename to idea/testData/multiplatform/differentKindsOfDependencies/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsExplicit/bottom/bottom.kt b/idea/testData/multiplatform/duplicateActualsExplicit/bottom/bottom.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsExplicit/bottom/bottom.kt rename to idea/testData/multiplatform/duplicateActualsExplicit/bottom/bottom.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsExplicit/dependencies.txt b/idea/testData/multiplatform/duplicateActualsExplicit/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsExplicit/dependencies.txt rename to idea/testData/multiplatform/duplicateActualsExplicit/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsExplicit/middle/middle.kt b/idea/testData/multiplatform/duplicateActualsExplicit/middle/middle.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsExplicit/middle/middle.kt rename to idea/testData/multiplatform/duplicateActualsExplicit/middle/middle.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsExplicit/top/top.kt b/idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsExplicit/top/top.kt rename to idea/testData/multiplatform/duplicateActualsExplicit/top/top.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsImplicit/bottom/bottom.kt b/idea/testData/multiplatform/duplicateActualsImplicit/bottom/bottom.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsImplicit/bottom/bottom.kt rename to idea/testData/multiplatform/duplicateActualsImplicit/bottom/bottom.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsImplicit/dependencies.txt b/idea/testData/multiplatform/duplicateActualsImplicit/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsImplicit/dependencies.txt rename to idea/testData/multiplatform/duplicateActualsImplicit/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsImplicit/middle/middle.kt b/idea/testData/multiplatform/duplicateActualsImplicit/middle/middle.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsImplicit/middle/middle.kt rename to idea/testData/multiplatform/duplicateActualsImplicit/middle/middle.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsImplicit/top/top.kt b/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsImplicit/top/top.kt rename to idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWeaklyIncompatible/bottom/bottom.kt b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/bottom/bottom.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWeaklyIncompatible/bottom/bottom.kt rename to idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/bottom/bottom.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWeaklyIncompatible/dependencies.txt b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWeaklyIncompatible/dependencies.txt rename to idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWeaklyIncompatible/middle/middle.kt b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/middle/middle.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWeaklyIncompatible/middle/middle.kt rename to idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/middle/middle.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWeaklyIncompatible/top/top.kt b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWeaklyIncompatible/top/top.kt rename to idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt rename to idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWithStrongIncompatibility/dependencies.txt b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWithStrongIncompatibility/dependencies.txt rename to idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt rename to idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/middle/middle.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWithStrongIncompatibility/top/top.kt b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/top/top.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWithStrongIncompatibility/top/top.kt rename to idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/top/top.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsExplicit/bottom/bottom.kt b/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsExplicit/bottom/bottom.kt rename to idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsExplicit/dependencies.txt b/idea/testData/multiplatform/duplicateExpectsExplicit/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsExplicit/dependencies.txt rename to idea/testData/multiplatform/duplicateExpectsExplicit/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsExplicit/left/left.kt b/idea/testData/multiplatform/duplicateExpectsExplicit/left/left.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsExplicit/left/left.kt rename to idea/testData/multiplatform/duplicateExpectsExplicit/left/left.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsExplicit/right/right.kt b/idea/testData/multiplatform/duplicateExpectsExplicit/right/right.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsExplicit/right/right.kt rename to idea/testData/multiplatform/duplicateExpectsExplicit/right/right.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsImplicit/bottom/bottom.kt b/idea/testData/multiplatform/duplicateExpectsImplicit/bottom/bottom.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsImplicit/bottom/bottom.kt rename to idea/testData/multiplatform/duplicateExpectsImplicit/bottom/bottom.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsImplicit/dependencies.txt b/idea/testData/multiplatform/duplicateExpectsImplicit/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsImplicit/dependencies.txt rename to idea/testData/multiplatform/duplicateExpectsImplicit/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsImplicit/left/left.kt b/idea/testData/multiplatform/duplicateExpectsImplicit/left/left.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsImplicit/left/left.kt rename to idea/testData/multiplatform/duplicateExpectsImplicit/left/left.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsImplicit/right/right.kt b/idea/testData/multiplatform/duplicateExpectsImplicit/right/right.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsImplicit/right/right.kt rename to idea/testData/multiplatform/duplicateExpectsImplicit/right/right.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt rename to idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/bottom/bottom.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsWithStrongIncompatibility/dependencies.txt b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsWithStrongIncompatibility/dependencies.txt rename to idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsWithStrongIncompatibility/left/left.kt b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/left/left.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsWithStrongIncompatibility/left/left.kt rename to idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/left/left.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsWithStrongIncompatibility/right/right.kt b/idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsWithStrongIncompatibility/right/right.kt rename to idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/right/right.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/hierarcicalActualization/common/common.kt b/idea/testData/multiplatform/hierarcicalActualization/common/common.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/hierarcicalActualization/common/common.kt rename to idea/testData/multiplatform/hierarcicalActualization/common/common.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/hierarcicalActualization/dependencies.txt b/idea/testData/multiplatform/hierarcicalActualization/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/hierarcicalActualization/dependencies.txt rename to idea/testData/multiplatform/hierarcicalActualization/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/hierarcicalActualization/js/js.kt b/idea/testData/multiplatform/hierarcicalActualization/js/js.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/hierarcicalActualization/js/js.kt rename to idea/testData/multiplatform/hierarcicalActualization/js/js.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/hierarcicalActualization/jvm/jvm.kt b/idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/hierarcicalActualization/jvm/jvm.kt rename to idea/testData/multiplatform/hierarcicalActualization/jvm/jvm.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/hierarcicalActualization/jvmAndJs/jvmAndJs.kt b/idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/hierarcicalActualization/jvmAndJs/jvmAndJs.kt rename to idea/testData/multiplatform/hierarcicalActualization/jvmAndJs/jvmAndJs.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/incompleteActualization/common/common.kt b/idea/testData/multiplatform/incompleteActualization/common/common.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/incompleteActualization/common/common.kt rename to idea/testData/multiplatform/incompleteActualization/common/common.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/incompleteActualization/dependencies.txt b/idea/testData/multiplatform/incompleteActualization/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/incompleteActualization/dependencies.txt rename to idea/testData/multiplatform/incompleteActualization/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/incompleteActualization/js/js.kt b/idea/testData/multiplatform/incompleteActualization/js/js.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/incompleteActualization/js/js.kt rename to idea/testData/multiplatform/incompleteActualization/js/js.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/incompleteActualization/jvm/jvm.kt b/idea/testData/multiplatform/incompleteActualization/jvm/jvm.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/incompleteActualization/jvm/jvm.kt rename to idea/testData/multiplatform/incompleteActualization/jvm/jvm.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/incompleteActualization/jvmAndJs/jvmAndJs.kt b/idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/incompleteActualization/jvmAndJs/jvmAndJs.kt rename to idea/testData/multiplatform/incompleteActualization/jvmAndJs/jvmAndJs.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/bottom/bottom.kt b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/bottom/bottom.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/bottom/bottom.kt rename to idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/bottom/bottom.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/dependencies.txt b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/dependencies.txt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/dependencies.txt rename to idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/dependencies.txt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt rename to idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/middle/middle.kt diff --git a/idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/top/top.kt b/idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/top/top.kt similarity index 100% rename from idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/top/top.kt rename to idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/top/top.kt diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HierarchicalExpectActualTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HierarchicalExpectActualTestGenerated.java deleted file mode 100644 index 90fe802609f..00000000000 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HierarchicalExpectActualTestGenerated.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.caches.resolve; - -import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TestMetadata; -import org.junit.runner.RunWith; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching") -@TestDataPath("$PROJECT_ROOT") -@RunWith(JUnit3RunnerWithInners.class) -public class HierarchicalExpectActualTestGenerated extends AbstractHierarchicalExpectActualTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInHierarchicalExpectActualMatching() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching"), Pattern.compile("^([^\\.]+)$"), null, false); - } - - @TestMetadata("diamondActualInBottom") - public void testDiamondActualInBottom() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualInBottom/"); - } - - @TestMetadata("diamondActualOnOnePath") - public void testDiamondActualOnOnePath() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondActualOnOnePath/"); - } - - @TestMetadata("diamondDuplicateActuals") - public void testDiamondDuplicateActuals() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondDuplicateActuals/"); - } - - @TestMetadata("diamondSeesTwoActuals") - public void testDiamondSeesTwoActuals() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/diamondSeesTwoActuals/"); - } - - @TestMetadata("differentKindsOfDependencies") - public void testDifferentKindsOfDependencies() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/differentKindsOfDependencies/"); - } - - @TestMetadata("duplicateActualsExplicit") - public void testDuplicateActualsExplicit() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsExplicit/"); - } - - @TestMetadata("duplicateActualsImplicit") - public void testDuplicateActualsImplicit() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsImplicit/"); - } - - @TestMetadata("duplicateActualsOneWeaklyIncompatible") - public void testDuplicateActualsOneWeaklyIncompatible() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWeaklyIncompatible/"); - } - - @TestMetadata("duplicateActualsOneWithStrongIncompatibility") - public void testDuplicateActualsOneWithStrongIncompatibility() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateActualsOneWithStrongIncompatibility/"); - } - - @TestMetadata("duplicateExpectsExplicit") - public void testDuplicateExpectsExplicit() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsExplicit/"); - } - - @TestMetadata("duplicateExpectsImplicit") - public void testDuplicateExpectsImplicit() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsImplicit/"); - } - - @TestMetadata("duplicateExpectsWithStrongIncompatibility") - public void testDuplicateExpectsWithStrongIncompatibility() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/duplicateExpectsWithStrongIncompatibility/"); - } - - @TestMetadata("hierarcicalActualization") - public void testHierarcicalActualization() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/hierarcicalActualization/"); - } - - @TestMetadata("incompleteActualization") - public void testIncompleteActualization() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/incompleteActualization/"); - } - - @TestMetadata("weaklyIncompatibleActualInIntermediateModule") - public void testWeaklyIncompatibleActualInIntermediateModule() throws Exception { - runTest("idea/testData/multiModuleHighlighting/hierarchicalExpectActualMatching/weaklyIncompatibleActualInIntermediateModule/"); - } -} diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java index c58fdd814e8..abb5597ece5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiplatformAnalysisTestGenerated.java @@ -48,6 +48,21 @@ public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAna runTest("idea/testData/multiplatform/correctOverloadResolutionAmbiguity/"); } + @TestMetadata("diamondActualInBottom") + public void testDiamondActualInBottom() throws Exception { + runTest("idea/testData/multiplatform/diamondActualInBottom/"); + } + + @TestMetadata("diamondActualOnOnePath") + public void testDiamondActualOnOnePath() throws Exception { + runTest("idea/testData/multiplatform/diamondActualOnOnePath/"); + } + + @TestMetadata("diamondDuplicateActuals") + public void testDiamondDuplicateActuals() throws Exception { + runTest("idea/testData/multiplatform/diamondDuplicateActuals/"); + } + @TestMetadata("diamondModuleDependency1") public void testDiamondModuleDependency1() throws Exception { runTest("idea/testData/multiplatform/diamondModuleDependency1/"); @@ -58,11 +73,66 @@ public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAna runTest("idea/testData/multiplatform/diamondModuleDependency2/"); } + @TestMetadata("diamondSeesTwoActuals") + public void testDiamondSeesTwoActuals() throws Exception { + runTest("idea/testData/multiplatform/diamondSeesTwoActuals/"); + } + + @TestMetadata("differentKindsOfDependencies") + public void testDifferentKindsOfDependencies() throws Exception { + runTest("idea/testData/multiplatform/differentKindsOfDependencies/"); + } + + @TestMetadata("duplicateActualsExplicit") + public void testDuplicateActualsExplicit() throws Exception { + runTest("idea/testData/multiplatform/duplicateActualsExplicit/"); + } + + @TestMetadata("duplicateActualsImplicit") + public void testDuplicateActualsImplicit() throws Exception { + runTest("idea/testData/multiplatform/duplicateActualsImplicit/"); + } + + @TestMetadata("duplicateActualsOneWeaklyIncompatible") + public void testDuplicateActualsOneWeaklyIncompatible() throws Exception { + runTest("idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/"); + } + + @TestMetadata("duplicateActualsOneWithStrongIncompatibility") + public void testDuplicateActualsOneWithStrongIncompatibility() throws Exception { + runTest("idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/"); + } + + @TestMetadata("duplicateExpectsExplicit") + public void testDuplicateExpectsExplicit() throws Exception { + runTest("idea/testData/multiplatform/duplicateExpectsExplicit/"); + } + + @TestMetadata("duplicateExpectsImplicit") + public void testDuplicateExpectsImplicit() throws Exception { + runTest("idea/testData/multiplatform/duplicateExpectsImplicit/"); + } + + @TestMetadata("duplicateExpectsWithStrongIncompatibility") + public void testDuplicateExpectsWithStrongIncompatibility() throws Exception { + runTest("idea/testData/multiplatform/duplicateExpectsWithStrongIncompatibility/"); + } + @TestMetadata("extensionOnExpect") public void testExtensionOnExpect() throws Exception { runTest("idea/testData/multiplatform/extensionOnExpect/"); } + @TestMetadata("hierarcicalActualization") + public void testHierarcicalActualization() throws Exception { + runTest("idea/testData/multiplatform/hierarcicalActualization/"); + } + + @TestMetadata("incompleteActualization") + public void testIncompleteActualization() throws Exception { + runTest("idea/testData/multiplatform/incompleteActualization/"); + } + @TestMetadata("internalFromDependsOn") public void testInternalFromDependsOn() throws Exception { runTest("idea/testData/multiplatform/internalFromDependsOn/"); @@ -147,4 +217,9 @@ public class MultiplatformAnalysisTestGenerated extends AbstractMultiplatformAna public void testUseCorrectBuiltIns() throws Exception { runTest("idea/testData/multiplatform/useCorrectBuiltIns/"); } + + @TestMetadata("weaklyIncompatibleActualInIntermediateModule") + public void testWeaklyIncompatibleActualInIntermediateModule() throws Exception { + runTest("idea/testData/multiplatform/weaklyIncompatibleActualInIntermediateModule/"); + } }