Skip to content

Commit 546734a

Browse files
committed
Move and expand the memberwise initializer test
1 parent 713dcd8 commit 546734a

File tree

5 files changed

+119
-25
lines changed

5 files changed

+119
-25
lines changed

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

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
class Person {
2+
internal init(firstName: String? = nil, lastName: String? = nil, age: Int? = nil, planet: String = "Earth", solarSystem: String = "Milky Way", avgHeight: Int = 175) {
3+
self.firstName = firstName
4+
self.lastName = lastName
5+
self.age = age
6+
self.planet = planet
7+
self.solarSystem = solarSystem
8+
self.avgHeight = avgHeight
9+
}
10+
11+
var firstName: String!
12+
var lastName: String!
13+
var age: Int!
14+
var planet = "Earth", solarSystem = "Milky Way"
15+
var avgHeight = 175
16+
let line = #line, file = #file, handle = #dsohandle
17+
lazy var idea: Idea = { fatalError() }()
18+
}
19+
20+
struct Place {
21+
let person: Person
22+
let street: String
23+
let apartment: Optional<String>
24+
let city: String
25+
let state: String
26+
let postalCode: Int
27+
let plusFour: Int?
28+
}
29+
30+
protocol Thing {
31+
var idea: Idea { get }
32+
}
33+
34+
enum Idea {
35+
var subject: String { fatalError() }
36+
}
37+
38+
39+
40+
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
class Person {
2+
var firstName: String!
3+
var lastName: String!
4+
var age: Int!
5+
var planet = "Earth", solarSystem = "Milky Way"
6+
var avgHeight = 175
7+
let line = #line, file = #file, handle = #dsohandle
8+
lazy var idea: Idea = { fatalError() }()
9+
}
10+
11+
struct Place {
12+
internal init(person: Person, street: String, apartment: Optional<String>, city: String, state: String, postalCode: Int, plusFour: Int?) {
13+
self.person = person
14+
self.street = street
15+
self.apartment = apartment
16+
self.city = city
17+
self.state = state
18+
self.postalCode = postalCode
19+
self.plusFour = plusFour
20+
}
21+
22+
let person: Person
23+
let street: String
24+
let apartment: Optional<String>
25+
let city: String
26+
let state: String
27+
let postalCode: Int
28+
let plusFour: Int?
29+
}
30+
31+
protocol Thing {
32+
var idea: Idea { get }
33+
}
34+
35+
enum Idea {
36+
var subject: String { fatalError() }
37+
}
38+
39+
40+
41+

test/refactoring/MemberwiseInit/class_members.swift

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
class Person {
2+
var firstName: String!
3+
var lastName: String!
4+
var age: Int!
5+
var planet = "Earth", solarSystem = "Milky Way"
6+
var avgHeight = 175
7+
let line = #line, file = #file, handle = #dsohandle
8+
lazy var idea: Idea = { fatalError() }()
9+
}
10+
11+
struct Place {
12+
let person: Person
13+
let street: String
14+
let apartment: Optional<String>
15+
let city: String
16+
let state: String
17+
let postalCode: Int
18+
let plusFour: Int?
19+
}
20+
21+
protocol Thing {
22+
var idea: Idea { get }
23+
}
24+
25+
enum Idea {
26+
var subject: String { fatalError() }
27+
}
28+
29+
// RUN: %empty-directory(%t.result)
30+
// RUN: %refactor -memberwise-init -source-filename %s -pos=1:8 > %t.result/generate_memberwise.swift
31+
// RUN: diff -u %S/Outputs/generate_memberwise/class_members.swift.expected %t.result/generate_memberwise.swift
32+
33+
// RUN: %refactor -memberwise-init -source-filename %s -pos=11:8 > %t.result/struct_members.swift
34+
// RUN: diff -u %S/Outputs/generate_memberwise/struct_members.swift.expected %t.result/struct_members.swift
35+
36+
// RUN: not %refactor -memberwise-init -source-filename %s -pos=21:10 > %t.result/protocol_members.swift
37+
// RUN: not %refactor -memberwise-init -source-filename %s -pos=25:6 > %t.result/enum_members.swift
38+

0 commit comments

Comments
 (0)