From 839df9620082ea5a2b6923292b782b3c943d3ebe Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 16 Sep 2013 15:53:40 +0400 Subject: [PATCH] Refactoring: change test data directive --- .../basic/common/DoNotCompleteForErrorReceivers.kt | 2 +- .../basic/common/DoNotCompleteForErrorReceiversForce.kt | 2 +- idea/testData/completion/basic/common/InMiddleOfPackage.kt | 2 +- idea/testData/completion/basic/common/InPackageBegin.kt | 2 +- .../completion/basic/common/NoClassNameDuplication.kt | 2 +- idea/testData/completion/basic/common/OverloadFunctions.kt | 2 +- .../completion/basic/java/ExtensionFromStandardLibrary.kt | 2 +- .../basic/java/NoClassNameDuplicationForRuntimeClass.kt | 2 +- .../completion/basic/java/NoImportedJavaClassDuplication.kt | 2 +- idea/testData/completion/basic/java/PropertyMetadata.kt | 2 +- .../basic/multifile/DoNotCompleteWithConstraints-1.kt | 2 +- .../basic/multifile/ExtensionFunctionOnUnresolved-1.kt | 2 +- .../completion/basic/multifile/ExtensionOnNullable-1.kt | 2 +- .../completion/basic/multifile/ExtensionProperty-1.kt | 2 +- .../basic/multifile/NotImportedExtensionFunction-1.kt | 2 +- idea/testData/completion/injava/ClassFromNamespace.java | 2 +- idea/testData/completion/injava/JetSubpackage.java | 2 +- .../testData/completion/weighers/LocalFileBeforeImported.kt | 2 +- .../jetbrains/jet/completion/ExpectedCompletionUtils.java | 6 +++--- .../completion/weighers/AbstractCompletionWeigherTest.kt | 2 +- 20 files changed, 22 insertions(+), 22 deletions(-) diff --git a/idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt b/idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt index f623ee069b5..a93c88cab5f 100644 --- a/idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt +++ b/idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt @@ -5,4 +5,4 @@ fun anyfun() { } // TIME: 1 -// NUMBER: 0 \ No newline at end of file +// INVOCATION_COUNT: 0 \ No newline at end of file diff --git a/idea/testData/completion/basic/common/DoNotCompleteForErrorReceiversForce.kt b/idea/testData/completion/basic/common/DoNotCompleteForErrorReceiversForce.kt index e2d9d3a115f..195e54cf0be 100644 --- a/idea/testData/completion/basic/common/DoNotCompleteForErrorReceiversForce.kt +++ b/idea/testData/completion/basic/common/DoNotCompleteForErrorReceiversForce.kt @@ -5,4 +5,4 @@ fun anyfun() { } // TIME: 2 -// NUMBER: 0 \ No newline at end of file +// INVOCATION_COUNT: 0 \ No newline at end of file diff --git a/idea/testData/completion/basic/common/InMiddleOfPackage.kt b/idea/testData/completion/basic/common/InMiddleOfPackage.kt index 55b048140d8..cda80afcea2 100644 --- a/idea/testData/completion/basic/common/InMiddleOfPackage.kt +++ b/idea/testData/completion/basic/common/InMiddleOfPackage.kt @@ -7,4 +7,4 @@ class Test { } // EXIST: util -// NUMBER: 1 +// INVOCATION_COUNT: 1 diff --git a/idea/testData/completion/basic/common/InPackageBegin.kt b/idea/testData/completion/basic/common/InPackageBegin.kt index 145e0f062cb..d6ad5e84a65 100644 --- a/idea/testData/completion/basic/common/InPackageBegin.kt +++ b/idea/testData/completion/basic/common/InPackageBegin.kt @@ -2,4 +2,4 @@ package kttesting.util // Test that there won't be package with completion fake suffix -// NUMBER: 0 \ No newline at end of file +// INVOCATION_COUNT: 0 \ No newline at end of file diff --git a/idea/testData/completion/basic/common/NoClassNameDuplication.kt b/idea/testData/completion/basic/common/NoClassNameDuplication.kt index 09d74a6533a..a8e55fb06da 100644 --- a/idea/testData/completion/basic/common/NoClassNameDuplication.kt +++ b/idea/testData/completion/basic/common/NoClassNameDuplication.kt @@ -9,4 +9,4 @@ fun firstFun() { // TIME: 1 // EXIST: Testing -// NUMBER: 1 \ No newline at end of file +// INVOCATION_COUNT: 1 \ No newline at end of file diff --git a/idea/testData/completion/basic/common/OverloadFunctions.kt b/idea/testData/completion/basic/common/OverloadFunctions.kt index df91ec7b5f9..1eda5fe6bd4 100644 --- a/idea/testData/completion/basic/common/OverloadFunctions.kt +++ b/idea/testData/completion/basic/common/OverloadFunctions.kt @@ -21,4 +21,4 @@ fun testMy() { } // EXIST: testOther -// NUMBER: 3 \ No newline at end of file +// INVOCATION_COUNT: 3 \ No newline at end of file diff --git a/idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt b/idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt index f28da6dbde1..75e5c5941c8 100644 --- a/idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt +++ b/idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt @@ -9,4 +9,4 @@ fun firstFun() { // TIME: 1 // EXIST: toLinkedList@toLinkedList()~for jet.Iterable in kotlin -// NUMBER: 1 +// INVOCATION_COUNT: 1 diff --git a/idea/testData/completion/basic/java/NoClassNameDuplicationForRuntimeClass.kt b/idea/testData/completion/basic/java/NoClassNameDuplicationForRuntimeClass.kt index 4b9d2114d1c..5a7c6ef73d3 100644 --- a/idea/testData/completion/basic/java/NoClassNameDuplicationForRuntimeClass.kt +++ b/idea/testData/completion/basic/java/NoClassNameDuplicationForRuntimeClass.kt @@ -2,4 +2,4 @@ val x = LineIterator // TIME: 1 // EXIST: LineIterator~(kotlin.io) -// NUMBER: 1 +// INVOCATION_COUNT: 1 diff --git a/idea/testData/completion/basic/java/NoImportedJavaClassDuplication.kt b/idea/testData/completion/basic/java/NoImportedJavaClassDuplication.kt index fddd4bd02fc..6360ee6f1a4 100644 --- a/idea/testData/completion/basic/java/NoImportedJavaClassDuplication.kt +++ b/idea/testData/completion/basic/java/NoImportedJavaClassDuplication.kt @@ -4,4 +4,4 @@ val x = InputStreamReader // TIME: 1 // EXIST: InputStreamReader~(java.io) -// NUMBER: 1 \ No newline at end of file +// INVOCATION_COUNT: 1 \ No newline at end of file diff --git a/idea/testData/completion/basic/java/PropertyMetadata.kt b/idea/testData/completion/basic/java/PropertyMetadata.kt index 6d19763b980..40c0439f6c9 100644 --- a/idea/testData/completion/basic/java/PropertyMetadata.kt +++ b/idea/testData/completion/basic/java/PropertyMetadata.kt @@ -8,4 +8,4 @@ fun firstFun() { // TIME: 1 // EXIST: PropertyMetadata@PropertyMetadata~(jet) // EXIST: PropertyMetadataImpl@PropertyMetadataImpl~(jet) -// NUMBER: 2 +// INVOCATION_COUNT: 2 diff --git a/idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints-1.kt b/idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints-1.kt index 2bc456b90ab..20b7ee4a494 100644 --- a/idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints-1.kt +++ b/idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints-1.kt @@ -12,4 +12,4 @@ fun firstFun() { // EXIST: testingExpectedFunction // ABSENT: testingUnexpectedFunction -// NUMBER: 2 \ No newline at end of file +// INVOCATION_COUNT: 2 \ No newline at end of file diff --git a/idea/testData/completion/basic/multifile/ExtensionFunctionOnUnresolved-1.kt b/idea/testData/completion/basic/multifile/ExtensionFunctionOnUnresolved-1.kt index 784ac599a7a..26634510535 100644 --- a/idea/testData/completion/basic/multifile/ExtensionFunctionOnUnresolved-1.kt +++ b/idea/testData/completion/basic/multifile/ExtensionFunctionOnUnresolved-1.kt @@ -8,4 +8,4 @@ fun firstFun() { // ABSENT: helloFun // ABSENT: helloFunPreventAutoInsert // ABSENT: helloWithParams -// NUMBER: 0 \ No newline at end of file +// INVOCATION_COUNT: 0 \ No newline at end of file diff --git a/idea/testData/completion/basic/multifile/ExtensionOnNullable-1.kt b/idea/testData/completion/basic/multifile/ExtensionOnNullable-1.kt index 66e065edf74..889c2a7e8a3 100644 --- a/idea/testData/completion/basic/multifile/ExtensionOnNullable-1.kt +++ b/idea/testData/completion/basic/multifile/ExtensionOnNullable-1.kt @@ -9,4 +9,4 @@ fun firstFun() { // EXIST: helloFunPreventAutoInsert // EXIST: helloWithParams // ABSENT: helloFake -// NUMBER: 3 \ No newline at end of file +// INVOCATION_COUNT: 3 \ No newline at end of file diff --git a/idea/testData/completion/basic/multifile/ExtensionProperty-1.kt b/idea/testData/completion/basic/multifile/ExtensionProperty-1.kt index 45b5e8b4acc..86a839df13c 100644 --- a/idea/testData/completion/basic/multifile/ExtensionProperty-1.kt +++ b/idea/testData/completion/basic/multifile/ExtensionProperty-1.kt @@ -9,4 +9,4 @@ fun firstFun() { // EXIST: someProperty // EXIST: someOtherProperty // EXIST: someSelfProperty -// NUMBER: 3 \ No newline at end of file +// INVOCATION_COUNT: 3 \ No newline at end of file diff --git a/idea/testData/completion/basic/multifile/NotImportedExtensionFunction-1.kt b/idea/testData/completion/basic/multifile/NotImportedExtensionFunction-1.kt index dda68250d5e..3c5c80a9227 100644 --- a/idea/testData/completion/basic/multifile/NotImportedExtensionFunction-1.kt +++ b/idea/testData/completion/basic/multifile/NotImportedExtensionFunction-1.kt @@ -9,4 +9,4 @@ fun firstFun() { // EXIST: helloFunPreventAutoInsert // EXIST: helloWithParams // ABSENT: helloFake -// NUMBER: 3 \ No newline at end of file +// INVOCATION_COUNT: 3 \ No newline at end of file diff --git a/idea/testData/completion/injava/ClassFromNamespace.java b/idea/testData/completion/injava/ClassFromNamespace.java index 632afe633cc..895b6fee5ec 100644 --- a/idea/testData/completion/injava/ClassFromNamespace.java +++ b/idea/testData/completion/injava/ClassFromNamespace.java @@ -6,4 +6,4 @@ public class Testing { // EXIST: ClassFromJet // EXIST: SomePackage -// NUMBER: 2 +// INVOCATION_COUNT: 2 diff --git a/idea/testData/completion/injava/JetSubpackage.java b/idea/testData/completion/injava/JetSubpackage.java index cd7a9fe9f01..8cd7b98ddc3 100644 --- a/idea/testData/completion/injava/JetSubpackage.java +++ b/idea/testData/completion/injava/JetSubpackage.java @@ -8,4 +8,4 @@ public class Testing { // ABSENT: jet2 // Only two proposals expected -// NUMBER: 1 +// INVOCATION_COUNT: 1 diff --git a/idea/testData/completion/weighers/LocalFileBeforeImported.kt b/idea/testData/completion/weighers/LocalFileBeforeImported.kt index 331485d51fe..7f368f73dd0 100644 --- a/idea/testData/completion/weighers/LocalFileBeforeImported.kt +++ b/idea/testData/completion/weighers/LocalFileBeforeImported.kt @@ -8,5 +8,5 @@ val some = foo // "foo" is before other elements because of exact prefix match // ORDER: foo, fooVar, fooLocal, fooImported, fooNotImported -// NUMBER: 2 +// INVOCATION_COUNT: 2 // SELECTED: 1 \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java b/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java index 29c30feb75b..cc8f61aae0a 100644 --- a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java +++ b/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java @@ -104,9 +104,9 @@ public class ExpectedCompletionUtils { private static final String EXIST_JAVA_ONLY_LINE_PREFIX = "EXIST_JAVA_ONLY:"; private static final String EXIST_JS_ONLY_LINE_PREFIX = "EXIST_JS_ONLY:"; - private static final String NUMBER_LINE_PREFIX = "NUMBER:"; - private static final String NUMBER_JS_LINE_PREFIX = "NUMBER_JS:"; - private static final String NUMBER_JAVA_LINE_PREFIX = "NUMBER_JAVA:"; + private static final String NUMBER_LINE_PREFIX = "INVOCATION_COUNT:"; + private static final String NUMBER_JS_LINE_PREFIX = "INVOCATION_COUNT_JS:"; + private static final String NUMBER_JAVA_LINE_PREFIX = "INVOCATION_COUNT_JAVA:"; private static final String EXECUTION_TIME_PREFIX = "TIME:"; private static final String WITH_ORDER_PREFIX = "WITH_ORDER:"; diff --git a/idea/tests/org/jetbrains/jet/completion/weighers/AbstractCompletionWeigherTest.kt b/idea/tests/org/jetbrains/jet/completion/weighers/AbstractCompletionWeigherTest.kt index 6b991c788ee..249e6455061 100644 --- a/idea/tests/org/jetbrains/jet/completion/weighers/AbstractCompletionWeigherTest.kt +++ b/idea/tests/org/jetbrains/jet/completion/weighers/AbstractCompletionWeigherTest.kt @@ -45,7 +45,7 @@ public abstract class AbstractCompletionWeigherTest() : LightCodeInsightFixtureT val items = InTextDirectivesUtils.findArrayWithPrefixes(text, "// ORDER:") Assert.assertTrue(!items.isEmpty(), """Some items should be defined with "// ORDER:" directive""") - fixture.complete(CompletionType.BASIC, InTextDirectivesUtils.getPrefixedInt(text, "// NUMBER:") ?: 1) + fixture.complete(CompletionType.BASIC, InTextDirectivesUtils.getPrefixedInt(text, "// INVOCATION_COUNT:") ?: 1) fixture.assertPreferredCompletionItems(InTextDirectivesUtils.getPrefixedInt(text, "// SELECTED:") ?: 0, *items) }