Skip to content

Commit 0721e29

Browse files
rintarorintaro
committed
[CodeCompletion] Migrate a completion test to batch-completion
1 parent 044473f commit 0721e29

File tree

1 file changed

+6
-37
lines changed

1 file changed

+6
-37
lines changed

‎test/IDE/complete_from_clang_framework.swift

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,4 @@
1-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=SWIFT_COMPLETIONS | %FileCheck %s -check-prefix=SWIFT_COMPLETIONS
2-
3-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=FW_UNQUAL_1 > %t.compl.txt
4-
// RUN: %FileCheck %s -check-prefix=CLANG_FOO < %t.compl.txt
5-
// RUN: %FileCheck %s -check-prefix=CLANG_FOO_SUB < %t.compl.txt
6-
// RUN: %FileCheck %s -check-prefix=CLANG_FOO_HELPER < %t.compl.txt
7-
// RUN: %FileCheck %s -check-prefix=CLANG_FOO_HELPER_SUB < %t.compl.txt
8-
// RUN: %FileCheck %s -check-prefix=CLANG_BAR < %t.compl.txt
9-
// RUN: %FileCheck %s -check-prefix=CLANG_BOTH_FOO_BAR < %t.compl.txt
10-
11-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=CLANG_QUAL_FOO_1 > %t.compl.txt
12-
// RUN: %FileCheck %s -check-prefix=CLANG_FOO < %t.compl.txt
13-
// RUN: %FileCheck %s -check-prefix=CLANG_FOO_SUB < %t.compl.txt
14-
// RUN: %FileCheck %s -check-prefix=CLANG_QUAL_FOO_NEGATIVE < %t.compl.txt
15-
16-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=CLANG_QUAL_BAR_1 > %t.compl.txt
17-
// RUN: %FileCheck %s -check-prefix=CLANG_QUAL_BAR_1 < %t.compl.txt
18-
// RUN: %FileCheck %s -check-prefix=CLANG_BAR < %t.compl.txt
19-
// RUN: %FileCheck %s -check-prefix=CLANG_QUAL_BAR_NEGATIVE < %t.compl.txt
20-
21-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=CLANG_QUAL_FOO_2 | %FileCheck %s -check-prefix=CLANG_QUAL_FOO_2
22-
23-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=FUNCTION_CALL_1 | %FileCheck %s -check-prefix=FUNCTION_CALL_1
24-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=FUNCTION_CALL_2 | %FileCheck %s -check-prefix=FUNCTION_CALL_2
25-
26-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=CLANG_STRUCT_MEMBERS_1 | %FileCheck %s -check-prefix=CLANG_STRUCT_MEMBERS_1
27-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=CLANG_CLASS_MEMBERS_1 | %FileCheck %s -check-prefix=CLANG_CLASS_MEMBERS_1
28-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=CLANG_CLASS_MEMBERS_2 | %FileCheck %s -check-prefix=CLANG_CLASS_MEMBERS_2
29-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=CLANG_INSTANCE_MEMBERS_1 | %FileCheck %s -check-prefix=CLANG_INSTANCE_MEMBERS_1
30-
31-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=TYPE_MODULE_QUALIFIER | %FileCheck %s -check-prefix=MODULE_QUALIFIER
32-
// RUN: %target-swift-ide-test -code-completion -source-filename %s -F %S/Inputs/mock-sdk -enable-objc-interop -code-completion-token=EXPR_MODULE_QUALIFIER | %FileCheck %s -check-prefix=MODULE_QUALIFIER
1+
// RUN: %batch-code-completion -F %S/Inputs/mock-sdk -enable-objc-interop
332

343
import Foo
354
// Don't import FooHelper directly in this test!
@@ -123,11 +92,11 @@ func testSwiftCompletions(foo: SwiftStruct) {
12392
// CLANG_QUAL_BAR_NEGATIVE-NOT: FOO
12493

12594
func testClangModule() {
126-
#^FW_UNQUAL_1^#
95+
#^FW_UNQUAL_1?check=CLANG_FOO;check=CLANG_FOO_SUB;check=CLANG_FOO_HELPER;check=CLANG_FOO_HELPER_SUB;check=CLANG_BAR;check=CLANG_BOTH_FOO_BAR^#
12796
}
12897

12998
func testCompleteModuleQualifiedFoo1() {
130-
Foo.#^CLANG_QUAL_FOO_1^#
99+
Foo.#^CLANG_QUAL_FOO_1?check=CLANG_FOO;check=CLANG_FOO_SUB;check=CLANG_QUAL_FOO_NEGATIVE^#
131100
}
132101

133102
func testCompleteModuleQualifiedFoo2() {
@@ -206,7 +175,7 @@ func testCompleteModuleQualifiedFoo2() {
206175
}
207176

208177
func testCompleteModuleQualifiedBar1() {
209-
Bar.#^CLANG_QUAL_BAR_1^#
178+
Bar.#^CLANG_QUAL_BAR_1?check=CLANG_QUAL_BAR_1;check=CLANG_BAR;check=CLANG_QUAL_BAR_NEGATIVE^#
210179
// If the number of results below changes, this is an indication that you need
211180
// to add a result to the appropriate list. Do not just bump the number!
212181
// CLANG_QUAL_BAR_1: Begin completions, 8 items
@@ -312,8 +281,8 @@ func testCompleteInstanceMembers1(fooObject: FooClassDerived) {
312281
}
313282

314283
// Check the FooHelper module is suggested even though it's not imported directly
315-
func testExportedModuleCompletion() -> #^TYPE_MODULE_QUALIFIER^# {
316-
let x = #^EXPR_MODULE_QUALIFIER^#
284+
func testExportedModuleCompletion() -> #^TYPE_MODULE_QUALIFIER?check=MODULE_QUALIFIER^# {
285+
let x = #^EXPR_MODULE_QUALIFIER?check=MODULE_QUALIFIER^#
317286
// MODULE_QUALIFIER-DAG: Decl[Module]/None: swift_ide_test[#Module#]; name=swift_ide_test
318287
// MODULE_QUALIFIER-DAG: Decl[Module]/None/IsSystem: Swift[#Module#]; name=Swift
319288
// MODULE_QUALIFIER-DAG: Decl[Module]/None: Foo[#Module#]; name=Foo

0 commit comments

Comments
 (0)