From 2fe7cc553402bff9e5b62265c020352a1e70bcbb Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 15 Sep 2017 15:03:45 +0300 Subject: [PATCH] Add more tests for KT-20262 --- .../deprecatedHeaderImpl/header/header.kt | 3 +++ .../deprecatedHeaderImpl/header/header.kt.after | 3 +++ .../deprecatedHeaderImpl/jvm/foo.kt | 1 + .../deprecatedHeaderImpl/jvm/foo.kt.after | 1 + .../deprecatedImplHeader/header/header.kt | 1 + .../deprecatedImplHeader/header/header.kt.after | 1 + .../deprecatedImplHeader/jvm/foo.kt | 3 +++ .../deprecatedImplHeader/jvm/foo.kt.after | 3 +++ .../kotlin/idea/quickfix/QuickFixMultiModuleTest.kt | 10 ++++++++++ 9 files changed, 26 insertions(+) create mode 100644 idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/header/header.kt create mode 100644 idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/header/header.kt.after create mode 100644 idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/jvm/foo.kt create mode 100644 idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/jvm/foo.kt.after create mode 100644 idea/testData/multiModuleQuickFix/deprecatedImplHeader/header/header.kt create mode 100644 idea/testData/multiModuleQuickFix/deprecatedImplHeader/header/header.kt.after create mode 100644 idea/testData/multiModuleQuickFix/deprecatedImplHeader/jvm/foo.kt create mode 100644 idea/testData/multiModuleQuickFix/deprecatedImplHeader/jvm/foo.kt.after diff --git a/idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/header/header.kt b/idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/header/header.kt new file mode 100644 index 00000000000..d8fc29d3f5c --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/header/header.kt @@ -0,0 +1,3 @@ +// "Replace with 'expect'" "true" + +header fun foo(): Int \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/header/header.kt.after b/idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/header/header.kt.after new file mode 100644 index 00000000000..f46ccc28fc4 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/header/header.kt.after @@ -0,0 +1,3 @@ +// "Replace with 'expect'" "true" + +expect fun foo(): Int \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/jvm/foo.kt b/idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/jvm/foo.kt new file mode 100644 index 00000000000..084d86c7a3c --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/jvm/foo.kt @@ -0,0 +1 @@ +impl fun foo() = 42 \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/jvm/foo.kt.after b/idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/jvm/foo.kt.after new file mode 100644 index 00000000000..084d86c7a3c --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedHeaderImpl/jvm/foo.kt.after @@ -0,0 +1 @@ +impl fun foo() = 42 \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedImplHeader/header/header.kt b/idea/testData/multiModuleQuickFix/deprecatedImplHeader/header/header.kt new file mode 100644 index 00000000000..e462a5f6ffd --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedImplHeader/header/header.kt @@ -0,0 +1 @@ +header fun foo(): Int \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedImplHeader/header/header.kt.after b/idea/testData/multiModuleQuickFix/deprecatedImplHeader/header/header.kt.after new file mode 100644 index 00000000000..e462a5f6ffd --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedImplHeader/header/header.kt.after @@ -0,0 +1 @@ +header fun foo(): Int \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedImplHeader/jvm/foo.kt b/idea/testData/multiModuleQuickFix/deprecatedImplHeader/jvm/foo.kt new file mode 100644 index 00000000000..5cc2fbb33bc --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedImplHeader/jvm/foo.kt @@ -0,0 +1,3 @@ +// "Replace with 'actual'" "true" + +impl fun foo() = 42 \ No newline at end of file diff --git a/idea/testData/multiModuleQuickFix/deprecatedImplHeader/jvm/foo.kt.after b/idea/testData/multiModuleQuickFix/deprecatedImplHeader/jvm/foo.kt.after new file mode 100644 index 00000000000..18263c881a0 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/deprecatedImplHeader/jvm/foo.kt.after @@ -0,0 +1,3 @@ +// "Replace with 'actual'" "true" + +actual fun foo() = 42 \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt index 31cdbf1d100..cb9d7d4fcba 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt @@ -59,11 +59,21 @@ class QuickFixMultiModuleTest : AbstractQuickFixMultiModuleTest() { doMultiPlatformTest() } + @Test + fun testDeprecatedHeaderImpl() { + doMultiPlatformTest() + } + @Test fun testDeprecatedImpl() { doMultiPlatformTest() } + @Test + fun testDeprecatedImplHeader() { + doMultiPlatformTest() + } + @Test fun testEnum() { doMultiPlatformTest(impls = "js" to TargetPlatformKind.JavaScript)