From 7f5b9b1760e4507cb89fda0d219bd7cd1fd92abd Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 19 Sep 2017 14:27:36 +0300 Subject: [PATCH] Add tests on quick fix that adds 'actual' to platform declaration #KT-18454 --- .../addActualToClass/header/header.kt | 1 + .../addActualToClass/header/header.kt.after | 1 + .../multiModuleQuickFix/addActualToClass/jvm/jvm.kt | 4 ++++ .../addActualToClass/jvm/jvm.kt.after | 4 ++++ .../addActualToClassMember/header/header.kt | 3 +++ .../addActualToClassMember/header/header.kt.after | 3 +++ .../addActualToClassMember/jvm/jvm.kt | 6 ++++++ .../addActualToClassMember/jvm/jvm.kt.after | 6 ++++++ .../addActualToTopLevelMember/header/header.kt | 1 + .../addActualToTopLevelMember/header/header.kt.after | 1 + .../addActualToTopLevelMember/jvm/jvm.kt | 4 ++++ .../addActualToTopLevelMember/jvm/jvm.kt.after | 4 ++++ .../kotlin/idea/quickfix/QuickFixMultiModuleTest.kt | 11 ++++++++++- 13 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 idea/testData/multiModuleQuickFix/addActualToClass/header/header.kt create mode 100644 idea/testData/multiModuleQuickFix/addActualToClass/header/header.kt.after create mode 100644 idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt create mode 100644 idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt.after create mode 100644 idea/testData/multiModuleQuickFix/addActualToClassMember/header/header.kt create mode 100644 idea/testData/multiModuleQuickFix/addActualToClassMember/header/header.kt.after create mode 100644 idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt create mode 100644 idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt.after create mode 100644 idea/testData/multiModuleQuickFix/addActualToTopLevelMember/header/header.kt create mode 100644 idea/testData/multiModuleQuickFix/addActualToTopLevelMember/header/header.kt.after create mode 100644 idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt create mode 100644 idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt.after diff --git a/idea/testData/multiModuleQuickFix/addActualToClass/header/header.kt b/idea/testData/multiModuleQuickFix/addActualToClass/header/header.kt new file mode 100644 index 00000000000..2a3a31a2dec --- /dev/null +++ b/idea/testData/multiModuleQuickFix/addActualToClass/header/header.kt @@ -0,0 +1 @@ +expect class Foo diff --git a/idea/testData/multiModuleQuickFix/addActualToClass/header/header.kt.after b/idea/testData/multiModuleQuickFix/addActualToClass/header/header.kt.after new file mode 100644 index 00000000000..2a3a31a2dec --- /dev/null +++ b/idea/testData/multiModuleQuickFix/addActualToClass/header/header.kt.after @@ -0,0 +1 @@ +expect class Foo diff --git a/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt new file mode 100644 index 00000000000..9b309e97108 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt @@ -0,0 +1,4 @@ +// "Add 'actual' modifier" "true" +// ERROR: Declaration should be marked with 'actual' (suppress with -Xno-check-actual) + +class Foo diff --git a/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt.after new file mode 100644 index 00000000000..35ba8a5b671 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/addActualToClass/jvm/jvm.kt.after @@ -0,0 +1,4 @@ +// "Add 'actual' modifier" "true" +// ERROR: Declaration should be marked with 'actual' (suppress with -Xno-check-actual) + +actual class Foo diff --git a/idea/testData/multiModuleQuickFix/addActualToClassMember/header/header.kt b/idea/testData/multiModuleQuickFix/addActualToClassMember/header/header.kt new file mode 100644 index 00000000000..35615e686a1 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/addActualToClassMember/header/header.kt @@ -0,0 +1,3 @@ +expect class Foo { + fun foo() +} diff --git a/idea/testData/multiModuleQuickFix/addActualToClassMember/header/header.kt.after b/idea/testData/multiModuleQuickFix/addActualToClassMember/header/header.kt.after new file mode 100644 index 00000000000..35615e686a1 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/addActualToClassMember/header/header.kt.after @@ -0,0 +1,3 @@ +expect class Foo { + fun foo() +} diff --git a/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt new file mode 100644 index 00000000000..77c8881cde4 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt @@ -0,0 +1,6 @@ +// "Add 'actual' modifier" "true" +// ERROR: Declaration should be marked with 'actual' (suppress with -Xno-check-actual) + +actual class Foo { + fun foo() {} +} diff --git a/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt.after new file mode 100644 index 00000000000..fc95413ae61 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/addActualToClassMember/jvm/jvm.kt.after @@ -0,0 +1,6 @@ +// "Add 'actual' modifier" "true" +// ERROR: Declaration should be marked with 'actual' (suppress with -Xno-check-actual) + +actual class Foo { + actual fun foo() {} +} diff --git a/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/header/header.kt b/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/header/header.kt new file mode 100644 index 00000000000..892bde13e9c --- /dev/null +++ b/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/header/header.kt @@ -0,0 +1 @@ +expect fun foo() diff --git a/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/header/header.kt.after b/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/header/header.kt.after new file mode 100644 index 00000000000..892bde13e9c --- /dev/null +++ b/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/header/header.kt.after @@ -0,0 +1 @@ +expect fun foo() diff --git a/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt b/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt new file mode 100644 index 00000000000..5e347ce8e07 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt @@ -0,0 +1,4 @@ +// "Add 'actual' modifier" "true" +// ERROR: Declaration should be marked with 'actual' (suppress with -Xno-check-actual) + +fun foo() {} diff --git a/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt.after b/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt.after new file mode 100644 index 00000000000..6aefcbd3230 --- /dev/null +++ b/idea/testData/multiModuleQuickFix/addActualToTopLevelMember/jvm/jvm.kt.after @@ -0,0 +1,4 @@ +// "Add 'actual' modifier" "true" +// ERROR: Declaration should be marked with 'actual' (suppress with -Xno-check-actual) + +actual fun foo() {} diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt index ef5cdce7a5d..7a393f9c782 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt @@ -189,4 +189,13 @@ class QuickFixMultiModuleTest : AbstractQuickFixMultiModuleTest() { @Test fun testImplementMembersInImplClassNonImplInheritor() = doMultiPlatformTest() -} \ No newline at end of file + + @Test + fun testAddActualToClass() = doMultiPlatformTest() + + @Test + fun testAddActualToClassMember() = doMultiPlatformTest() + + @Test + fun testAddActualToTopLevelMember() = doMultiPlatformTest() +}