Skip to content

Commit 5ddafde

Browse files
committed
[FixCode] Move AnyObject bits into an objc-interop test
Keep the main test portable by moving the objc_interop bits into their own test, combined with the existing selector tests.
1 parent debda31 commit 5ddafde

File tree

5 files changed

+33
-37
lines changed

5 files changed

+33
-37
lines changed

test/FixCode/fixits-apply-selector.swift renamed to test/FixCode/fixits-apply-objc.swift

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-objc-attr-requires-foundation-module -parse %s -emit-fixits-path %t.remap
1+
// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-objc-attr-requires-foundation-module -parse %s -emit-fixits-path %t.remap
22
// RUN: c-arcmt-test %t.remap | arcmt-test -verify-transformed-files %s.result
33
import ObjectiveC
44

@@ -12,3 +12,12 @@ import ObjectiveC
1212
takeSel(Selector("mySel"))
1313
}
1414
}
15+
16+
func foo(an : Any) {
17+
let a1 : AnyObject
18+
a1 = an
19+
let a2 : AnyObject?
20+
a2 = an
21+
let a3 : AnyObject!
22+
a3 = an
23+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// RUN: not %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-objc-attr-requires-foundation-module -parse %s -emit-fixits-path %t.remap
2+
// RUN: c-arcmt-test %t.remap | arcmt-test -verify-transformed-files %s.result
3+
import ObjectiveC
4+
5+
// REQUIRES: objc_interop
6+
7+
@objc class Selectors {
8+
func takeSel(_: Selector) {}
9+
func mySel() {}
10+
func test() {
11+
takeSel(#selector(Selectors.mySel))
12+
takeSel(#selector(Selectors.mySel))
13+
}
14+
}
15+
16+
func foo(an : Any) {
17+
let a1 : AnyObject
18+
a1 = an as AnyObject
19+
let a2 : AnyObject?
20+
a2 = an as AnyObject?
21+
let a3 : AnyObject!
22+
a3 = an as AnyObject!
23+
}

test/FixCode/fixits-apply-selector.swift.result

Lines changed: 0 additions & 14 deletions
This file was deleted.

test/FixCode/fixits-apply.swift

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// RUN: not %swift -parse -target %target-triple %s -emit-fixits-path %t.remap -I %S/Inputs
22
// RUN: c-arcmt-test %t.remap | arcmt-test -verify-transformed-files %s.result
33

4-
// REQUIRES: objc_interop
5-
64
class Base {}
75
class Derived : Base {}
86

@@ -263,12 +261,3 @@ func disable_unnamed_param_reorder(p: Int, _: String) {}
263261
disable_unnamed_param_reorder(0, "") // no change.
264262

265263
prefix operator ***** {}
266-
267-
func foo(an : Any) {
268-
let a1 : AnyObject
269-
a1 = an
270-
let a2 : AnyObject?
271-
a2 = an
272-
let a3 : AnyObject!
273-
a3 = an
274-
}

test/FixCode/fixits-apply.swift.result

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// RUN: not %swift -parse -target %target-triple %s -emit-fixits-path %t.remap -I %S/Inputs
22
// RUN: c-arcmt-test %t.remap | arcmt-test -verify-transformed-files %s.result
33

4-
// REQUIRES: objc_interop
5-
64
class Base {}
75
class Derived : Base {}
86

@@ -266,12 +264,3 @@ func disable_unnamed_param_reorder(p: Int, _: String) {}
266264
disable_unnamed_param_reorder(0, "") // no change.
267265

268266
prefix operator *****
269-
270-
func foo(an : Any) {
271-
let a1 : AnyObject
272-
a1 = an as AnyObject
273-
let a2 : AnyObject?
274-
a2 = an as AnyObject?
275-
let a3 : AnyObject!
276-
a3 = an as AnyObject!
277-
}

0 commit comments

Comments
 (0)