From 4b1edf7bb0e9df355bbb18963a23489a6fa0f51e Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Thu, 17 Dec 2015 10:54:01 +0300 Subject: [PATCH] Intention tests: add directive to skip errors before --- .../convertMemberToExtension/valWithDefaultGetter.kt | 3 +-- .../convertMemberToExtension/valWithDefaultGetter.kt.after | 3 +-- .../convertMemberToExtension/varWithDefaultGetterAndSetter.kt | 3 +-- .../varWithDefaultGetterAndSetter.kt.after | 3 +-- .../convertMemberToExtension/varWithDefaultSetter.kt | 3 +-- .../convertMemberToExtension/varWithDefaultSetter.kt.after | 3 +-- .../declarations/convertMemberToExtension/varWithGetter.kt | 4 +--- .../convertMemberToExtension/varWithGetter.kt.after | 4 +--- .../declarations/convertMemberToExtension/varWithSetter.kt | 4 ++-- .../convertMemberToExtension/varWithSetter.kt.after | 4 ++-- .../intentions/removeExplicitType/removeUnresolvedType.kt | 3 +-- .../removeExplicitType/removeUnresolvedType.kt.after | 3 +-- .../kotlin/idea/intentions/AbstractIntentionTest.java | 4 +++- 13 files changed, 17 insertions(+), 27 deletions(-) diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt b/idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt index 7e56294079a..aa7fa5c108a 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt +++ b/idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt @@ -1,6 +1,5 @@ -// ERROR: Property must be initialized or be abstract // WITH_RUNTIME -// SKIP_ERRORS_AFTER +// SKIP_ERRORS_BEFORE class Owner { val p: Int get diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after index 0f56192d305..edf32305ad9 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after +++ b/idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after @@ -1,6 +1,5 @@ -// ERROR: Property must be initialized or be abstract // WITH_RUNTIME -// SKIP_ERRORS_AFTER +// SKIP_ERRORS_BEFORE class Owner { } diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt b/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt index 747abdaf068..11e035abe3f 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt +++ b/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt @@ -1,6 +1,5 @@ -// ERROR: Property must be initialized or be abstract // WITH_RUNTIME -// SKIP_ERRORS_AFTER +// SKIP_ERRORS_BEFORE class Owner { var p: Int get diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after index deeb7babb69..6a3895e1f6b 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after +++ b/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after @@ -1,6 +1,5 @@ -// ERROR: Property must be initialized or be abstract // WITH_RUNTIME -// SKIP_ERRORS_AFTER +// SKIP_ERRORS_BEFORE class Owner { } diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt b/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt index aa5d5101dcb..a21ab6ec218 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt +++ b/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt @@ -1,6 +1,5 @@ -// ERROR: Property must be initialized // WITH_RUNTIME -// SKIP_ERRORS_AFTER +// SKIP_ERRORS_BEFORE class Owner { var p: Int get() = 1 diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after index 5f0e49390db..d69df4aa479 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after +++ b/idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after @@ -1,6 +1,5 @@ -// ERROR: Property must be initialized // WITH_RUNTIME -// SKIP_ERRORS_AFTER +// SKIP_ERRORS_BEFORE class Owner { } diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt b/idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt index 2e8bc5344e3..6d09e504724 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt +++ b/idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt @@ -1,7 +1,5 @@ -// ERROR: Property must be initialized // WITH_RUNTIME -// SKIP_ERRORS_AFTER - +// SKIP_ERRORS_BEFORE class Owner { var p: Int get() { return 1 } diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after index 9bae6212469..944a8da8d83 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after +++ b/idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after @@ -1,7 +1,5 @@ -// ERROR: Property must be initialized // WITH_RUNTIME -// SKIP_ERRORS_AFTER - +// SKIP_ERRORS_BEFORE class Owner { } diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt b/idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt index 74796340b93..f43bf0779f7 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt +++ b/idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt @@ -1,6 +1,6 @@ -// ERROR: Property must be initialized // WITH_RUNTIME -// SKIP_ERRORS_AFTER +// SKIP_ERRORS_BEFORE + class Owner { var p: Int set(v) {} diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after b/idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after index b8492c1c161..ee631943851 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after +++ b/idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after @@ -1,6 +1,6 @@ -// ERROR: Property must be initialized // WITH_RUNTIME -// SKIP_ERRORS_AFTER +// SKIP_ERRORS_BEFORE + class Owner { } diff --git a/idea/testData/intentions/removeExplicitType/removeUnresolvedType.kt b/idea/testData/intentions/removeExplicitType/removeUnresolvedType.kt index 1e479665363..8366f2a4f28 100644 --- a/idea/testData/intentions/removeExplicitType/removeUnresolvedType.kt +++ b/idea/testData/intentions/removeExplicitType/removeUnresolvedType.kt @@ -1,6 +1,5 @@ // WITH_RUNTIME -// ERROR: Unresolved reference: Bad -// SKIP_ERRORS_AFTER +// SKIP_ERRORS_BEFORE package testing diff --git a/idea/testData/intentions/removeExplicitType/removeUnresolvedType.kt.after b/idea/testData/intentions/removeExplicitType/removeUnresolvedType.kt.after index cab272beda1..fd15aaa5d0d 100644 --- a/idea/testData/intentions/removeExplicitType/removeUnresolvedType.kt.after +++ b/idea/testData/intentions/removeExplicitType/removeUnresolvedType.kt.after @@ -1,6 +1,5 @@ // WITH_RUNTIME -// ERROR: Unresolved reference: Bad -// SKIP_ERRORS_AFTER +// SKIP_ERRORS_BEFORE package testing diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java index f2a9866147e..6c6efc3cb7a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java @@ -122,7 +122,9 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase { ConfigLibraryUtil.configureKotlinRuntimeAndSdk(getModule(), PluginTestCaseBase.mockJdk()); } - DirectiveBasedActionUtils.INSTANCE$.checkForUnexpectedErrors((KtFile) getFile()); + if (getFile() instanceof KtFile && !InTextDirectivesUtils.isDirectiveDefined(fileText, "// SKIP_ERRORS_BEFORE")) { + DirectiveBasedActionUtils.INSTANCE$.checkForUnexpectedErrors((KtFile) getFile()); + } doTestFor(pathToFile, intentionAction, fileText);