Skip to content

Commit ef8629c

Browse files
committed
Renamed custom model mapping to avoid overlapping terms
1 parent 1ef4a44 commit ef8629c

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

CoreDataMigration-Example/CoreData/Migration/CoreDataMigrationModel.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class CoreDataMigrationModel {
122122

123123
switch version {
124124
case .version1, .version2: //manual mapped versions
125-
guard let mapping = manualMappingModel(to: nextVersion) else {
125+
guard let mapping = customMappingModel(to: nextVersion) else {
126126
return nil
127127
}
128128

@@ -134,13 +134,15 @@ class CoreDataMigrationModel {
134134

135135
func inferredMappingModel(to nextVersion: CoreDataMigrationModel) -> NSMappingModel {
136136
do {
137-
return try NSMappingModel.inferredMappingModel(forSourceModel: managedObjectModel(), destinationModel: nextVersion.managedObjectModel())
137+
let sourceModel = managedObjectModel()
138+
let destinationModel = nextVersion.managedObjectModel()
139+
return try NSMappingModel.inferredMappingModel(forSourceModel: sourceModel, destinationModel: destinationModel)
138140
} catch {
139141
fatalError("unable to generate inferred mapping model")
140142
}
141143
}
142144

143-
func manualMappingModel(to nextVersion: CoreDataMigrationModel) -> NSMappingModel? {
145+
func customMappingModel(to nextVersion: CoreDataMigrationModel) -> NSMappingModel? {
144146
let sourceModel = managedObjectModel()
145147
let destinationModel = nextVersion.managedObjectModel()
146148
guard let mapping = NSMappingModel(from: [modelBundle], forSourceModel: sourceModel, destinationModel: destinationModel) else {

CoreDataMigration-ExampleTests/CoreData/Migration/CoreDataMigrationModelTests.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ class CoreDataMigrationModelTests: XCTestCase {
1818
class CoreDataMigrationModelSpy: CoreDataMigrationModel {
1919

2020
var inferredMappingModelWasCalled = false
21-
var manualMappingModelWasCalled = false
21+
var customMappingModelWasCalled = false
2222

2323
override func inferredMappingModel(to nextVersion: CoreDataMigrationModel) -> NSMappingModel {
2424
inferredMappingModelWasCalled = true
2525

2626
return NSMappingModel()
2727
}
2828

29-
override func manualMappingModel(to nextVersion: CoreDataMigrationModel) -> NSMappingModel? {
30-
manualMappingModelWasCalled = true
29+
override func customMappingModel(to nextVersion: CoreDataMigrationModel) -> NSMappingModel? {
30+
customMappingModelWasCalled = true
3131

3232
return NSMappingModel()
3333
}
@@ -113,7 +113,7 @@ class CoreDataMigrationModelTests: XCTestCase {
113113
let mappingModel = version.mappingModelToSuccessor()
114114

115115
XCTAssertNotNil(mappingModel)
116-
XCTAssertTrue(version.manualMappingModelWasCalled)
116+
XCTAssertTrue(version.customMappingModelWasCalled)
117117
}
118118

119119
func test_fromVersion2_manualMapping() {
@@ -122,7 +122,7 @@ class CoreDataMigrationModelTests: XCTestCase {
122122
let mappingModel = version.mappingModelToSuccessor()
123123

124124
XCTAssertNotNil(mappingModel)
125-
XCTAssertTrue(version.manualMappingModelWasCalled)
125+
XCTAssertTrue(version.customMappingModelWasCalled)
126126
}
127127

128128
func test_fromVersion3_inferredMapping() {

0 commit comments

Comments
 (0)