Skip to content

Commit 083b719

Browse files
committed
[Refactoring] Add memberwise initializer generation test cases for properties with getter and setter
1 parent 314b243 commit 083b719

File tree

4 files changed

+34
-5
lines changed

4 files changed

+34
-5
lines changed

test/refactoring/MemberwiseInit/Outputs/generate_memberwise/class_members.swift.expected

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class Person {
2-
internal init(firstName: String? = nil, lastName: String? = nil, age: Int? = nil, planet: String = "Earth", solarSystem: String = "Milky Way", avgHeight: Int = 175, location: @escaping () -> Place = { fatalError() }, secondLocation: (() -> Place)? = nil, wrapped: String = "") {
2+
internal init(firstName: String? = nil, lastName: String? = nil, age: Int? = nil, planet: String = "Earth", solarSystem: String = "Milky Way", avgHeight: Int = 175, location: @escaping () -> Place = { fatalError() }, secondLocation: (() -> Place)? = nil, wrapped: String = "", didSet: String = "ds") {
33
self.firstName = firstName
44
self.lastName = lastName
55
self.age = age
@@ -9,6 +9,7 @@ self.avgHeight = avgHeight
99
self.location = location
1010
self.secondLocation = secondLocation
1111
self.wrapped = wrapped
12+
self.didSet = didSet
1213
}
1314

1415
var firstName: String!
@@ -22,6 +23,13 @@ self.wrapped = wrapped
2223
var secondLocation: (() -> Place)!
2324
@MyWrapper var wrapped: String = ""
2425
var computed: String { "hi" }
26+
var getSet: String {
27+
get { "hi" }
28+
set {}
29+
}
30+
var didSet: String = "ds" {
31+
didSet { print("didSet") }
32+
}
2533
}
2634

2735
struct Place {

test/refactoring/MemberwiseInit/Outputs/generate_memberwise/only_computed_members.swift.expected

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ class Person {
1010
var secondLocation: (() -> Place)!
1111
@MyWrapper var wrapped: String = ""
1212
var computed: String { "hi" }
13+
var getSet: String {
14+
get { "hi" }
15+
set {}
16+
}
17+
var didSet: String = "ds" {
18+
didSet { print("didSet") }
19+
}
1320
}
1421

1522
struct Place {

test/refactoring/MemberwiseInit/Outputs/generate_memberwise/struct_members.swift.expected

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ class Person {
1010
var secondLocation: (() -> Place)!
1111
@MyWrapper var wrapped: String = ""
1212
var computed: String { "hi" }
13+
var getSet: String {
14+
get { "hi" }
15+
set {}
16+
}
17+
var didSet: String = "ds" {
18+
didSet { print("didSet") }
19+
}
1320
}
1421

1522
struct Place {

test/refactoring/MemberwiseInit/generate_memberwise.swift

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ class Person {
1010
var secondLocation: (() -> Place)!
1111
@MyWrapper var wrapped: String = ""
1212
var computed: String { "hi" }
13+
var getSet: String {
14+
get { "hi" }
15+
set {}
16+
}
17+
var didSet: String = "ds" {
18+
didSet { print("didSet") }
19+
}
1320
}
1421

1522
struct Place {
@@ -48,12 +55,12 @@ struct MyWrapper {
4855
// RUN: %refactor -memberwise-init -source-filename %s -pos=1:8 > %t.result/generate_memberwise.swift
4956
// RUN: diff -u %S/Outputs/generate_memberwise/class_members.swift.expected %t.result/generate_memberwise.swift
5057

51-
// RUN: %refactor -memberwise-init -source-filename %s -pos=15:8 > %t.result/struct_members.swift
58+
// RUN: %refactor -memberwise-init -source-filename %s -pos=22:8 > %t.result/struct_members.swift
5259
// RUN: diff -u %S/Outputs/generate_memberwise/struct_members.swift.expected %t.result/struct_members.swift
5360

54-
// RUN: %refactor -memberwise-init -source-filename %s -pos=37:8 > %t.result/only_computed_members.swift
61+
// RUN: %refactor -memberwise-init -source-filename %s -pos=44:8 > %t.result/only_computed_members.swift
5562
// RUN: diff -u %S/Outputs/generate_memberwise/only_computed_members.swift.expected %t.result/only_computed_members.swift
5663

57-
// RUN: not %refactor -memberwise-init -source-filename %s -pos=29:10 > %t.result/protocol_members.swift
58-
// RUN: not %refactor -memberwise-init -source-filename %s -pos=33:6 > %t.result/enum_members.swift
64+
// RUN: not %refactor -memberwise-init -source-filename %s -pos=36:10 > %t.result/protocol_members.swift
65+
// RUN: not %refactor -memberwise-init -source-filename %s -pos=40:6 > %t.result/enum_members.swift
5966

0 commit comments

Comments
 (0)