Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Verify: Bug 285 #286

Closed
wants to merge 8 commits into from
Closed

Verify: Bug 285 #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
83ee8c7
Add resources
3lvis Sep 23, 2016
96a856f
Merge branch 'master' into bug285
3lvis Sep 24, 2016
e1ffde1
Add id
3lvis Sep 24, 2016
59fbb8b
Disable Xcode 8's logging
3lvis Sep 24, 2016
88439bd
Fix retarded setup
3lvis Sep 24, 2016
ad6d52e
Use category and film as primary keys
3lvis Sep 24, 2016
e6d9ace
Simplify test case
3lvis Sep 24, 2016
8ae03c5
Remove unused attributes
3lvis Sep 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions Demo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
14A644161CD77C7A00F51E23 /* bug-202-b.json in Resources */ = {isa = PBXBuildFile; fileRef = 14A644131CD77C7A00F51E23 /* bug-202-b.json */; };
14BF14DA1D6ED307008F5915 /* to-one-camelcase.json in Resources */ = {isa = PBXBuildFile; fileRef = 14BF14D81D6ED307008F5915 /* to-one-camelcase.json */; };
14BF14DB1D6ED307008F5915 /* to-one-snakecase.json in Resources */ = {isa = PBXBuildFile; fileRef = 14BF14D91D6ED307008F5915 /* to-one-snakecase.json */; };
14C82BFD1D95534C0035D0D3 /* 285.json in Resources */ = {isa = PBXBuildFile; fileRef = 14C82BFC1D95534C0035D0D3 /* 285.json */; };
14D16B3A1D6EE27000F63AB2 /* Bug239.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 14D16B381D6EE27000F63AB2 /* Bug239.xcdatamodeld */; };
14D16B3D1D6EE28F00F63AB2 /* bug-239.json in Resources */ = {isa = PBXBuildFile; fileRef = 14D16B3B1D6EE28F00F63AB2 /* bug-239.json */; };
14D4CA801C48176F00CAB8A0 /* NSManagedObject+SyncTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14D4CA7F1C48176F00CAB8A0 /* NSManagedObject+SyncTests.swift */; };
Expand All @@ -93,6 +94,7 @@
14D7321F1CE9A6C400C28D40 /* 157-cities.json in Resources */ = {isa = PBXBuildFile; fileRef = 14D7321E1CE9A6C400C28D40 /* 157-cities.json */; };
14D943591C51844C00F90DC2 /* NSArray+SyncTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14D943581C51844C00F90DC2 /* NSArray+SyncTests.swift */; };
14E298431C563EE500B68B72 /* OrderedSocial.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 14E298411C563EE500B68B72 /* OrderedSocial.xcdatamodeld */; };
14EEEDA01D96FF2400673754 /* 285.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 14EEED9E1D96FF2400673754 /* 285.xcdatamodeld */; };
14FDB4D11C511A5B0061D9FA /* SyncTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14FDB4D01C511A5B0061D9FA /* SyncTests.swift */; };
14FDB4D31C511A6F0061D9FA /* Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14FDB4D21C511A6F0061D9FA /* Helper.swift */; };
B0B637141C6E4F2D00229B03 /* Bug179.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = B0B637121C6E4F2D00229B03 /* Bug179.xcdatamodeld */; };
Expand Down Expand Up @@ -188,6 +190,7 @@
14C0AF811BD6D4230009ECBE /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
14C0AF821BD6D4230009ECBE /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
14C0AF831BD6D4230009ECBE /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
14C82BFC1D95534C0035D0D3 /* 285.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = 285.json; sourceTree = "<group>"; };
14D16B391D6EE27000F63AB2 /* Superentities.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Superentities.xcdatamodel; sourceTree = "<group>"; };
14D16B3B1D6EE28F00F63AB2 /* bug-239.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "bug-239.json"; sourceTree = "<group>"; };
14D4CA7F1C48176F00CAB8A0 /* NSManagedObject+SyncTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+SyncTests.swift"; sourceTree = "<group>"; tabWidth = 4; };
Expand All @@ -196,6 +199,7 @@
14D7321E1CE9A6C400C28D40 /* 157-cities.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "157-cities.json"; sourceTree = "<group>"; };
14D943581C51844C00F90DC2 /* NSArray+SyncTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = "NSArray+SyncTests.swift"; sourceTree = "<group>"; tabWidth = 4; };
14E298421C563EE500B68B72 /* Demo.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Demo.xcdatamodel; sourceTree = "<group>"; };
14EEED9F1D96FF2400673754 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
14FDB4D01C511A5B0061D9FA /* SyncTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = SyncTests.swift; sourceTree = "<group>"; tabWidth = 4; };
14FDB4D21C511A6F0061D9FA /* Helper.swift */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = Helper.swift; sourceTree = "<group>"; tabWidth = 4; };
3009E229ED9B6FAA003C2296 /* Pods-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -238,10 +242,11 @@
14D7321E1CE9A6C400C28D40 /* 157-cities.json */,
140B0DEE1CEAFAFC00D0EE3E /* 157-locations-update.json */,
141D9E711CE9A4830041A7FC /* 157-locations.json */,
149112351D70272D00167D26 /* 225-a.json */,
149112361D70272D00167D26 /* 225-a-replaced.json */,
147A3A0D1D704D860049C22A /* 225-a-empty.json */,
147A3A0E1D704D860049C22A /* 225-a-null.json */,
149112361D70272D00167D26 /* 225-a-replaced.json */,
149112351D70272D00167D26 /* 225-a.json */,
14C82BFC1D95534C0035D0D3 /* 285.json */,
1418940B1BDD62F600EE52CE /* bug-113-comments-no-id.json */,
1418940C1BDD62F600EE52CE /* bug-113-custom_relationship_key_to_one.json */,
1418940D1BDD62F600EE52CE /* bug-113-stories-comments-no-ids.json */,
Expand Down Expand Up @@ -294,6 +299,7 @@
14096A401CEAF483002690D6 /* 151-ordered-to-many.xcdatamodeld */,
14096A3A1CEAF40E002690D6 /* 151-to-many.xcdatamodeld */,
149112431D70279200167D26 /* 225.xcdatamodeld */,
14EEED9E1D96FF2400673754 /* 285.xcdatamodeld */,
1418942B1BDD62F600EE52CE /* Bug84.xcdatamodeld */,
141894251BDD62F600EE52CE /* Bug113.xcdatamodeld */,
141894291BDD62F600EE52CE /* Bug125.xcdatamodeld */,
Expand Down Expand Up @@ -516,6 +522,7 @@
140FBF1E1CB91C2D0026484E /* camelcase.json in Resources */,
141894501BDD62F600EE52CE /* stories-comments-no-ids.json in Resources */,
147A3A0F1D704D860049C22A /* 225-a-empty.json in Resources */,
14C82BFD1D95534C0035D0D3 /* 285.json in Resources */,
1418944F1BDD62F600EE52CE /* patients.json in Resources */,
141894471BDD62F600EE52CE /* custom_relationship_key_to_many.json in Resources */,
14BF14DB1D6ED307008F5915 /* to-one-snakecase.json in Resources */,
Expand Down Expand Up @@ -611,6 +618,7 @@
1469B7F91C68D7820080FD71 /* NotesB.xcdatamodeld in Sources */,
141894631BDD62F600EE52CE /* Social.xcdatamodeld in Sources */,
1425D5A11CC65BEB00EC49D4 /* NSEntityDescription+Sync.swift in Sources */,
14EEEDA01D96FF2400673754 /* 285.xcdatamodeld in Sources */,
14096A431CEAF483002690D6 /* 151-ordered-to-many.xcdatamodeld in Sources */,
14096A421CEAF483002690D6 /* 151-ordered-many-to-many.xcdatamodeld in Sources */,
14096A3C1CEAF40E002690D6 /* 151-many-to-many.xcdatamodeld in Sources */,
Expand Down Expand Up @@ -1029,6 +1037,16 @@
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
};
14EEED9E1D96FF2400673754 /* 285.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
14EEED9F1D96FF2400673754 /* Model.xcdatamodel */,
);
currentVersion = 14EEED9F1D96FF2400673754 /* Model.xcdatamodel */;
path = 285.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
};
B0B637121C6E4F2D00229B03 /* Bug179.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
Expand Down
7 changes: 7 additions & 0 deletions Demo.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@
ReferencedContainer = "container:Demo.xcodeproj">
</BuildableReference>
</MacroExpansion>
<EnvironmentVariables>
<EnvironmentVariable
key = "OS_ACTIVITY_MODE"
value = "disable"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
Expand Down
2 changes: 1 addition & 1 deletion Source/Sync.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ import TestCheck
}

open class func changes(_ changes: [[String : Any]], inEntityNamed entityName: String, predicate: NSPredicate?, parent: NSManagedObject?, parentRelationship: NSRelationshipDescription?, inContext context: NSManagedObjectContext, dataStack: DATAStack, operations: DATAFilter.Operation, completion: ((_ error: NSError?) -> Void)?) {
guard let entity = NSEntityDescription.entity(forEntityName: entityName, in: context) else { abort() }
guard let entity = NSEntityDescription.entity(forEntityName: entityName, in: context) else { fatalError("Couldn't load entity named \(entityName)") }

let localPrimaryKey = entity.sync_localPrimaryKey()
let remotePrimaryKey = entity.sync_remotePrimaryKey()
Expand Down
10 changes: 10 additions & 0 deletions Tests/JSONs/285.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{
"category": "director",
"details": [
{
"film": "xxx"
}
]
}
]
23 changes: 23 additions & 0 deletions Tests/Models/285.xcdatamodeld/Model.xcdatamodel/contents
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11232" systemVersion="16A323" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
<entity name="FilmographyCD" syncable="YES">
<attribute name="category" optional="YES" attributeType="String" syncable="YES">
<userInfo>
<entry key="hyper.isPrimaryKey" value="true"/>
</userInfo>
</attribute>
<relationship name="details" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="FilmographyDetailsCD" inverseName="filmography" inverseEntity="FilmographyDetailsCD" syncable="YES"/>
</entity>
<entity name="FilmographyDetailsCD" syncable="YES">
<attribute name="film" optional="YES" attributeType="String" syncable="YES">
<userInfo>
<entry key="hyper.isPrimaryKey" value="true"/>
</userInfo>
</attribute>
<relationship name="filmography" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="FilmographyCD" inverseName="details" inverseEntity="FilmographyCD" syncable="YES"/>
</entity>
<elements>
<element name="FilmographyCD" positionX="-63" positionY="-18" width="128" height="75"/>
<element name="FilmographyDetailsCD" positionX="142" positionY="-81" width="128" height="73"/>
</elements>
</model>
11 changes: 11 additions & 0 deletions Tests/SyncTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,4 +1208,15 @@ class SyncTests: XCTestCase {

try! dataStack.drop()
}

func testBug285() {
let dataStack = Helper.dataStackWithModelName("285")

let films = Helper.objectsFromJSON("285.json") as! [[String : Any]]
Sync.changes(films, inEntityNamed: "FilmographyCD", dataStack: dataStack, completion: nil)
XCTAssertEqual(Helper.countForEntity("FilmographyCD", inContext:dataStack.mainContext), 1)
XCTAssertEqual(Helper.countForEntity("FilmographyDetailsCD", inContext:dataStack.mainContext), 1)

try! dataStack.drop()
}
}