193: Mute navigation tests in 193 (KT-34542)

2019-10-23 15:51:02 +03:00
parent 3e7767f096
commit 8563614b69
37 changed files with 323 additions and 10 deletions
@@ -308,11 +308,11 @@ fun main(args: Array<String>) {
            model("navigation/gotoSymbol", testMethod = "doSymbolTest")
        }

-        testClass<AbstractNavigateToLibrarySourceTest> {
+        testClass<AbstractNavigateToLibrarySourceTest>(annotations = listOf(muteExtraSuffix(".libsrc"))) {
            model("decompiler/navigation/usercode")
        }

-        testClass<AbstractNavigateToLibrarySourceTestWithJS> {
+        testClass<AbstractNavigateToLibrarySourceTestWithJS>(annotations = listOf(muteExtraSuffix(".libsrcjs"))) {
            model("decompiler/navigation/usercode", testClassName = "UsercodeWithJSModule")
        }

@@ -318,11 +318,11 @@ fun main(args: Array<String>) {
            model("navigation/gotoSymbol", testMethod = "doSymbolTest")
        }

-        testClass<AbstractNavigateToLibrarySourceTest> {
+        testClass<AbstractNavigateToLibrarySourceTest>(annotations = listOf(muteExtraSuffix(".libsrc"))) {
            model("decompiler/navigation/usercode")
        }

-        testClass<AbstractNavigateToLibrarySourceTestWithJS> {
+        testClass<AbstractNavigateToLibrarySourceTestWithJS>(annotations = listOf(muteExtraSuffix(".libsrcjs"))) {
            model("decompiler/navigation/usercode", testClassName ="UsercodeWithJSModule")
        }

@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest
 import org.jetbrains.kotlin.formatter.AbstractFormatterTest
 import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase
 import org.jetbrains.kotlin.generators.tests.generator.TestGroup
+import org.jetbrains.kotlin.generators.tests.generator.muteExtraSuffix
 import org.jetbrains.kotlin.generators.tests.generator.testGroup
 import org.jetbrains.kotlin.generators.util.KT_OR_KTS
 import org.jetbrains.kotlin.generators.util.KT_OR_KTS_WITHOUT_DOTS_IN_NAME
@@ -305,11 +306,11 @@ fun main(args: Array<String>) {
            model("navigation/gotoSymbol", testMethod = "doSymbolTest")
        }

-        testClass<AbstractNavigateToLibrarySourceTest> {
+        testClass<AbstractNavigateToLibrarySourceTest>(annotations = listOf(muteExtraSuffix(".libsrc"))) {
            model("decompiler/navigation/usercode")
        }

-        testClass<AbstractNavigateToLibrarySourceTestWithJS> {
+        testClass<AbstractNavigateToLibrarySourceTestWithJS>(annotations = listOf(muteExtraSuffix(".libsrcjs"))) {
            model("decompiler/navigation/usercode", testClassName ="UsercodeWithJSModule")
        }

@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest
 import org.jetbrains.kotlin.formatter.AbstractFormatterTest
 import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase
 import org.jetbrains.kotlin.generators.tests.generator.TestGroup
+import org.jetbrains.kotlin.generators.tests.generator.muteExtraSuffix
 import org.jetbrains.kotlin.generators.tests.generator.testGroup
 import org.jetbrains.kotlin.generators.util.KT_OR_KTS
 import org.jetbrains.kotlin.generators.util.KT_OR_KTS_WITHOUT_DOTS_IN_NAME
@@ -305,11 +306,11 @@ fun main(args: Array<String>) {
            model("navigation/gotoSymbol", testMethod = "doSymbolTest")
        }

-        testClass<AbstractNavigateToLibrarySourceTest> {
+        testClass<AbstractNavigateToLibrarySourceTest>(annotations = listOf(muteExtraSuffix(".libsrc"))) {
            model("decompiler/navigation/usercode")
        }

-        testClass<AbstractNavigateToLibrarySourceTestWithJS> {
+        testClass<AbstractNavigateToLibrarySourceTestWithJS>(annotations = listOf(muteExtraSuffix(".libsrcjs"))) {
            model("decompiler/navigation/usercode", testClassName ="UsercodeWithJSModule")
        }

@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest
 import org.jetbrains.kotlin.formatter.AbstractFormatterTest
 import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase
 import org.jetbrains.kotlin.generators.tests.generator.TestGroup
+import org.jetbrains.kotlin.generators.tests.generator.muteExtraSuffix
 import org.jetbrains.kotlin.generators.tests.generator.testGroup
 import org.jetbrains.kotlin.generators.util.KT_OR_KTS
 import org.jetbrains.kotlin.generators.util.KT_OR_KTS_WITHOUT_DOTS_IN_NAME
@@ -305,11 +306,11 @@ fun main(args: Array<String>) {
            model("navigation/gotoSymbol", testMethod = "doSymbolTest")
        }

-        testClass<AbstractNavigateToLibrarySourceTest> {
+        testClass<AbstractNavigateToLibrarySourceTest>(annotations = listOf(muteExtraSuffix(".libsrc"))) {
            model("decompiler/navigation/usercode")
        }

-        testClass<AbstractNavigateToLibrarySourceTestWithJS> {
+        testClass<AbstractNavigateToLibrarySourceTestWithJS>(annotations = listOf(muteExtraSuffix(".libsrcjs"))) {
            model("decompiler/navigation/usercode", testClassName ="UsercodeWithJSModule")
        }

@@ -0,0 +1,7 @@
+Actual data differs from file content: ClassObject.source.expected expected:<[main.kt
+    companion <1>object {
+        fun <2>foo() {]
+> but was:<[ WithInnerAndObject.class
+    public companion <1>object {
+        public final fun <2>foo(): kotlin.Unit { /* compiled code */ }]
+>
@@ -0,0 +1,7 @@
+Actual data differs from file content: ClassObject.source.expected expected:<[main.kt
+    companion <1>object {
+        fun <2>foo() {]
+> but was:<[ WithInnerAndObject.class
+    public companion <1>object {
+        public final fun <2>foo(): kotlin.Unit { /* compiled code */ }]
+>
@@ -0,0 +1,7 @@
+Actual data differs from file content: Constructor.source.expected expected:<[main.kt
+public class <1><3>ClassWithConstructor<2>(val a: String, b: Any) {
+    <4>constructor(a: String): this(a, a)]
+> but was:<[ ClassWithConstructor.class
+public final class <1><3>ClassWithConstructor public <2>constructor(a: kotlin.String, b: kotlin.Any) {
+    public <4>constructor(a: kotlin.String) { /* compiled code */ }]
+>
@@ -0,0 +1,7 @@
+Actual data differs from file content: Constructor.source.expected expected:<[main.kt
+public class <1><3>ClassWithConstructor<2>(val a: String, b: Any) {
+    <4>constructor(a: String): this(a, a)]
+> but was:<[ ClassWithConstructor.class
+public final class <1><3>ClassWithConstructor public <2>constructor(a: kotlin.String, b: kotlin.Any) {
+    public <4>constructor(a: kotlin.String) { /* compiled code */ }]
+>
@@ -0,0 +1,13 @@
+Actual data differs from file content: Enum.source.expected expected:<[main.kt
+public enum class <1><2>Color(val <4>rgb : Int) {
+    <3>RED(0xFF0000),]
+> but was:<[ Color.class
+public final enum class <1><2>Color private constructor(rgb: kotlin.Int) : kotlin.Enum<testData.libraries.Color> {
+    <3>RED,
+
+    GREEN,
+
+    BLUE;
+
+    public final val <4>rgb: kotlin.Int /* compiled code */]
+>
@@ -0,0 +1,13 @@
+Actual data differs from file content: Enum.source.expected expected:<[main.kt
+public enum class <1><2>Color(val <4>rgb : Int) {
+    <3>RED(0xFF0000),]
+> but was:<[ Color.class
+public final enum class <1><2>Color private constructor(rgb: kotlin.Int) : kotlin.Enum<testData.libraries.Color> {
+    <3>RED,
+
+    GREEN,
+
+    BLUE;
+
+    public final val <4>rgb: kotlin.Int /* compiled code */]
+>
@@ -0,0 +1,5 @@
+Actual data differs from file content: ExtensionFunction.source.expected expected:<[main.kt
+public inline fun <T> T.<1>filter(predicate: (T)-> Boolean) : T? = this]
+> but was:<[ MainKt.class
+public inline fun <T> T.<1>filter(predicate: (T) -> kotlin.Boolean): T? { /* compiled code */ }]
+>
@@ -0,0 +1,5 @@
+Actual data differs from file content: ExtensionFunction.source.expected expected:<[main.kt
+public inline fun <T> T.<1>filter(predicate: (T)-> Boolean) : T? = this]
+> but was:<[ MainKt.class
+public inline fun <T> T.<1>filter(predicate: (T) -> kotlin.Boolean): T? { /* compiled code */ }]
+>
@@ -0,0 +1,21 @@
+Actual data differs from file content: ExtensionProperty.source.expected expected:<[main.kt
+public val String.<1>exProp : String
+get() {
+    return this
+}
+
+public val Int.exProp : Int
+get() {
+    return this
+}
+
+public class Pair<A, B><2>(val first: A, val second: B)
+
+public val <T> Pair<T, T>.<3>exProp : String]
+> but was:<[ MainKt.class
+public val kotlin.String.<1>exProp: kotlin.String /* compiled code */
+
+public val <T> testData.libraries.Pair<T, T>.<3>exProp: kotlin.String /* compiled code */
+ Pair.class
+public final class Pair<A, B> public <2>constructor(first: A, second: B) {]
+>
@@ -0,0 +1,21 @@
+Actual data differs from file content: ExtensionProperty.source.expected expected:<[main.kt
+public val String.<1>exProp : String
+get() {
+    return this
+}
+
+public val Int.exProp : Int
+get() {
+    return this
+}
+
+public class Pair<A, B><2>(val first: A, val second: B)
+
+public val <T> Pair<T, T>.<3>exProp : String]
+> but was:<[ MainKt.class
+public val kotlin.String.<1>exProp: kotlin.String /* compiled code */
+
+public val <T> testData.libraries.Pair<T, T>.<3>exProp: kotlin.String /* compiled code */
+ Pair.class
+public final class Pair<A, B> public <2>constructor(first: A, second: B) {]
+>
@@ -0,0 +1,5 @@
+Actual data differs from file content: GenericFunctionWithExplicitlyDeclaredTypeArguments.source.expected expected:<[main.kt
+public fun <T> <1>genericFunc() : T = throw Exception()]
+> but was:<[ MainKt.class
+public fun <T> <1>genericFunc(): T { /* compiled code */ }]
+>
@@ -0,0 +1,5 @@
+Actual data differs from file content: GenericFunctionWithExplicitlyDeclaredTypeArguments.source.expected expected:<[main.kt
+public fun <T> <1>genericFunc() : T = throw Exception()]
+> but was:<[ MainKt.class
+public fun <T> <1>genericFunc(): T { /* compiled code */ }]
+>
@@ -0,0 +1,5 @@
+Actual data differs from file content: GenericFunctionWithInferredTypeArguments.source.expected expected:<[main.kt
+public fun <T> <1>genericFunc() : T = throw Exception()]
+> but was:<[ MainKt.class
+public fun <T> <1>genericFunc(): T { /* compiled code */ }]
+>
@@ -0,0 +1,5 @@
+Actual data differs from file content: GenericFunctionWithInferredTypeArguments.source.expected expected:<[main.kt
+public fun <T> <1>genericFunc() : T = throw Exception()]
+> but was:<[ MainKt.class
+public fun <T> <1>genericFunc(): T { /* compiled code */ }]
+>
@@ -0,0 +1,17 @@
+Actual data differs from file content: GlobalFunction.source.expected expected:<[main.kt
+public fun <1><2>func(a : Int, b : String = "55") {
+}
+
+public fun <3>func(a : Int, b : Int) {
+}
+
+public fun <4>func() {]
+> but was:<[ MainKt.class
+public fun <4>func(): kotlin.Unit { /* compiled code */ }
+
+public fun func(cs: kotlin.CharSequence): kotlin.Unit { /* compiled code */ }
+
+public fun <3>func(a: kotlin.Int, b: kotlin.Int): kotlin.Unit { /* compiled code */ }
+
+public fun <1><2>func(a: kotlin.Int, b: kotlin.String /* = compiled code */): kotlin.Unit { /* compiled code */ }]
+>
@@ -0,0 +1,17 @@
+Actual data differs from file content: GlobalFunction.source.expected expected:<[main.kt
+public fun <1><2>func(a : Int, b : String = "55") {
+}
+
+public fun <3>func(a : Int, b : Int) {
+}
+
+public fun <4>func() {]
+> but was:<[ MainKt.class
+public fun <4>func(): kotlin.Unit { /* compiled code */ }
+
+public fun func(cs: kotlin.CharSequence): kotlin.Unit { /* compiled code */ }
+
+public fun <3>func(a: kotlin.Int, b: kotlin.Int): kotlin.Unit { /* compiled code */ }
+
+public fun <1><2>func(a: kotlin.Int, b: kotlin.String /* = compiled code */): kotlin.Unit { /* compiled code */ }]
+>
@@ -0,0 +1,9 @@
+Actual data differs from file content: GlobalProperty.source.expected expected:<[main.kt
+public val <1>globalVal : Pair<Int, String> = Pair(239, "239")
+
+public val <2>globalValWithGetter : Long]
+> but was:<[ MainKt.class
+public val <1>globalVal: testData.libraries.Pair<kotlin.Int, kotlin.String> /* compiled code */
+
+public val <2>globalValWithGetter: kotlin.Long /* compiled code */]
+>
@@ -0,0 +1,9 @@
+Actual data differs from file content: GlobalProperty.source.expected expected:<[main.kt
+public val <1>globalVal : Pair<Int, String> = Pair(239, "239")
+
+public val <2>globalValWithGetter : Long]
+> but was:<[ MainKt.class
+public val <1>globalVal: testData.libraries.Pair<kotlin.Int, kotlin.String> /* compiled code */
+
+public val <2>globalValWithGetter: kotlin.Long /* compiled code */]
+>
@@ -0,0 +1,7 @@
+Actual data differs from file content: NamedObject.source.expected expected:<[main.kt
+public object <1>NamedObject {
+    public val <2>objectMember: Int = 1]
+> but was:<[ NamedObject.class
+public object <1>NamedObject {
+    public final val <2>objectMember: kotlin.Int /* compiled code */]
+>
@@ -0,0 +1,7 @@
+Actual data differs from file content: NamedObject.source.expected expected:<[main.kt
+public object <1>NamedObject {
+    public val <2>objectMember: Int = 1]
+> but was:<[ NamedObject.class
+public object <1>NamedObject {
+    public final val <2>objectMember: kotlin.Int /* compiled code */]
+>
@@ -0,0 +1,10 @@
+Actual data differs from file content: OverloadedFunWithTypeParam.source.expected expected:<[main.kt
+public fun <T: CharSequence> <2>funWithTypeParam(t: T) {
+}
+
+public fun <T: Number> <1>funWithTypeParam(t: T) {]
+> but was:<[ MainKt.class
+public fun <T : kotlin.CharSequence> <2>funWithTypeParam(t: T): kotlin.Unit { /* compiled code */ }
+
+public fun <T : kotlin.Number> <1>funWithTypeParam(t: T): kotlin.Unit { /* compiled code */ }]
+>
@@ -0,0 +1,10 @@
+Actual data differs from file content: OverloadedFunWithTypeParam.source.expected expected:<[main.kt
+public fun <T: CharSequence> <2>funWithTypeParam(t: T) {
+}
+
+public fun <T: Number> <1>funWithTypeParam(t: T) {]
+> but was:<[ MainKt.class
+public fun <T : kotlin.CharSequence> <2>funWithTypeParam(t: T): kotlin.Unit { /* compiled code */ }
+
+public fun <T : kotlin.Number> <1>funWithTypeParam(t: T): kotlin.Unit { /* compiled code */ }]
+>
@@ -0,0 +1,20 @@
+Actual data differs from file content: Property.source.expected expected:<[main.kt
+public abstract class <1>ClassWithAbstractAndOpenMembers {
+    public abstract fun abstractFun()
+    public open fun openFun() {
+    }
+
+    public abstract val abstractVal : String
+    public open val openVal : String = ""
+    public open val openValWithGetter : String
+    get() {
+        return "239"
+    }
+
+    public abstract var <2><3>abstractVar : ]String
+> but was:<[ ClassWithAbstractAndOpenMembers.class
+public abstract class <1>ClassWithAbstractAndOpenMembers public constructor() {
+    public abstract val abstractVal: kotlin.String
+
+    public abstract var <2><3>abstractVar: kotlin.]String
+>
@@ -0,0 +1,20 @@
+Actual data differs from file content: Property.source.expected expected:<[main.kt
+public abstract class <1>ClassWithAbstractAndOpenMembers {
+    public abstract fun abstractFun()
+    public open fun openFun() {
+    }
+
+    public abstract val abstractVal : String
+    public open val openVal : String = ""
+    public open val openValWithGetter : String
+    get() {
+        return "239"
+    }
+
+    public abstract var <2><3>abstractVar : ]String
+> but was:<[ ClassWithAbstractAndOpenMembers.class
+public abstract class <1>ClassWithAbstractAndOpenMembers public constructor() {
+    public abstract val abstractVal: kotlin.String
+
+    public abstract var <2><3>abstractVar: kotlin.]String
+>
@@ -0,0 +1,9 @@
+Actual data differs from file content: SameNameInDifferentSources.source.expected expected:<[extra.kt
+public fun <1>func(str : kotlin.String) {
+ main.kt
+public fun <2>func(a : Int, b : String = "55") {]
+> but was:<[ ExtraKt.class
+public fun <1>func(str: kotlin.String): kotlin.Unit { /* compiled code */ }
+ MainKt.class
+public fun <2>func(a: kotlin.Int, b: kotlin.String /* = compiled code */): kotlin.Unit { /* compiled code */ }]
+>
@@ -0,0 +1,9 @@
+Actual data differs from file content: SameNameInDifferentSources.source.expected expected:<[extra.kt
+public fun <1>func(str : kotlin.String) {
+ main.kt
+public fun <2>func(a : Int, b : String = "55") {]
+> but was:<[ ExtraKt.class
+public fun <1>func(str: kotlin.String): kotlin.Unit { /* compiled code */ }
+ MainKt.class
+public fun <2>func(a: kotlin.Int, b: kotlin.String /* = compiled code */): kotlin.Unit { /* compiled code */ }]
+>
@@ -0,0 +1,5 @@
+Actual data differs from file content: TypeAlias.source.expected expected:< [main.kt
+typealias <1><2>SimpleClassAlias = ]SimpleClass
+> but was:< [MainKt.class
+public typealias <1><2>SimpleClassAlias = testData.libraries.]SimpleClass
+>
@@ -0,0 +1,5 @@
+Actual data differs from file content: TypeAlias.source.expected expected:< [main.kt
+typealias <1><2>SimpleClassAlias = ]SimpleClass
+> but was:< [MainKt.class
+public typealias <1><2>SimpleClassAlias = testData.libraries.]SimpleClass
+>
@@ -0,0 +1,13 @@
+Actual data differs from file content: TypeWithSameShortName.source.expected expected:< [extra.kt
+public fun <2>processDouble(d: Double) {}
+
+public fun <1>processDouble(d: kotlin.Double) {}
+ main.kt
+public class <3>Double]
+> but was:< [Double.class
+public final class Double public <3>constructor() {
+ ExtraKt.class
+public fun <1>processDouble(d: kotlin.Double): kotlin.Unit { /* compiled code */ }
+
+public fun <2>processDouble(d: testData.libraries.Double): kotlin.Unit { /* compiled code */ }]
+>
@@ -0,0 +1,13 @@
+Actual data differs from file content: TypeWithSameShortName.source.expected expected:< [extra.kt
+public fun <2>processDouble(d: Double) {}
+
+public fun <1>processDouble(d: kotlin.Double) {}
+ main.kt
+public class <3>Double]
+> but was:< [Double.class
+public final class Double public <3>constructor() {
+ ExtraKt.class
+public fun <1>processDouble(d: kotlin.Double): kotlin.Unit { /* compiled code */ }
+
+public fun <2>processDouble(d: testData.libraries.Double): kotlin.Unit { /* compiled code */ }]
+>
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.decompiler.navigation;
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.MuteExtraSuffix;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;

@@ -18,6 +19,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/decompiler/navigation/usercode")
@TestDataPath("$PROJECT_ROOT")
+@MuteExtraSuffix(".libsrc")
@RunWith(JUnit3RunnerWithInners.class)
 public class NavigateToLibrarySourceTestGenerated extends AbstractNavigateToLibrarySourceTest {
    private void runTest(String testDataFilePath) throws Exception {
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.decompiler.navigation;
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.MuteExtraSuffix;
 import org.jetbrains.kotlin.test.TestMetadata;
 import org.junit.runner.RunWith;

@@ -18,6 +19,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/decompiler/navigation/usercode")
@TestDataPath("$PROJECT_ROOT")
+@MuteExtraSuffix(".libsrcjs")
@RunWith(JUnit3RunnerWithInners.class)
 public class NavigateToLibrarySourceTestWithJSGenerated extends AbstractNavigateToLibrarySourceTestWithJS {
    private void runTest(String testDataFilePath) throws Exception {