From 1604998afe517de4136a8e0a8ab811aafba8e6e4 Mon Sep 17 00:00:00 2001 From: Daniel Dahan Date: Thu, 12 Jul 2018 10:31:52 -0400 Subject: [PATCH] issue-143: Renamed JSON class to GraphJSON to avoid framework collisions. --- CHANGELOG.md | 4 ++ Graph.podspec | 2 +- Graph.xcodeproj/project.pbxproj | 20 +++++----- Sources/{JSON.swift => GraphJSON.swift} | 41 +++++++++++---------- Sources/Info.plist | 2 +- Tests/ActionGroupTests.swift | 4 +- Tests/ActionPropertyStressTests.swift | 10 ++--- Tests/ActionPropertyTests.swift | 6 +-- Tests/ActionTagTests.swift | 4 +- Tests/ActionTests.swift | 14 +++---- Tests/ActionThreadTests.swift | 12 +++--- Tests/EntityGroupTests.swift | 4 +- Tests/EntityPropertyStressTests.swift | 10 ++--- Tests/EntityPropertyTests.swift | 6 +-- Tests/EntityTagTests.swift | 4 +- Tests/EntityTests.swift | 14 +++---- Tests/EntityThreadTests.swift | 12 +++--- Tests/RelationshipGroupTests.swift | 4 +- Tests/RelationshipPropertyStressTests.swift | 10 ++--- Tests/RelationshipPropertyTests.swift | 6 +-- Tests/RelationshipTagTests.swift | 4 +- Tests/RelationshipTests.swift | 16 ++++---- Tests/RelationshipThreadTests.swift | 12 +++--- 23 files changed, 114 insertions(+), 107 deletions(-) rename Sources/{JSON.swift => GraphJSON.swift} (82%) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddb6be73..c1fc19b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.2.2 + +* [issue-143](https://github.com/CosmicMind/Graph/issues/143): Renamed JSON class to GraphJSON to avoid framework collisions. + ## 2.2.1 * Updated for Swift 4.1. diff --git a/Graph.podspec b/Graph.podspec index 67a7510e..6de77a6e 100755 --- a/Graph.podspec +++ b/Graph.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Graph' - s.version = '2.2.1' + s.version = '2.2.2' s.swift_version = '4.0' s.license = 'BSD-3-Clause' s.summary = 'Graph is a semantic database that is used to create data-driven applications.' diff --git a/Graph.xcodeproj/project.pbxproj b/Graph.xcodeproj/project.pbxproj index 7cba8732..a1b5dbaa 100644 --- a/Graph.xcodeproj/project.pbxproj +++ b/Graph.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 962EB9D01D9E9E6800DFA8C4 /* JSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 962EB9CF1D9E9E6800DFA8C4 /* JSON.swift */; }; - 962EB9D11D9E9E6800DFA8C4 /* JSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 962EB9CF1D9E9E6800DFA8C4 /* JSON.swift */; }; + 962EB9D01D9E9E6800DFA8C4 /* GraphJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 962EB9CF1D9E9E6800DFA8C4 /* GraphJSON.swift */; }; + 962EB9D11D9E9E6800DFA8C4 /* GraphJSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 962EB9CF1D9E9E6800DFA8C4 /* GraphJSON.swift */; }; 965BBDCF208B96CF00AC4ED5 /* ActionPropertyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 965BBDC8208B96CF00AC4ED5 /* ActionPropertyTests.swift */; }; 965BBDD0208B96CF00AC4ED5 /* ActionPropertyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 965BBDC8208B96CF00AC4ED5 /* ActionPropertyTests.swift */; }; 965BBDD1208B96CF00AC4ED5 /* ActionPropertyStressTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 965BBDC9208B96CF00AC4ED5 /* ActionPropertyStressTests.swift */; }; @@ -61,8 +61,8 @@ 9686720E1D3BEA50000CD904 /* ManagedRelationshipGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9686720C1D3BEA50000CD904 /* ManagedRelationshipGroup.swift */; }; 968672101D3BEA8F000CD904 /* ManagedActionGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9686720F1D3BEA8F000CD904 /* ManagedActionGroup.swift */; }; 968672111D3BEA8F000CD904 /* ManagedActionGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9686720F1D3BEA8F000CD904 /* ManagedActionGroup.swift */; }; - 968B3EA81DA89EC40099F8E5 /* JSON.swift in Headers */ = {isa = PBXBuildFile; fileRef = 962EB9CF1D9E9E6800DFA8C4 /* JSON.swift */; settings = {ATTRIBUTES = (Public, ); }; }; - 968B3EA91DA89ED40099F8E5 /* JSON.swift in Headers */ = {isa = PBXBuildFile; fileRef = 962EB9CF1D9E9E6800DFA8C4 /* JSON.swift */; settings = {ATTRIBUTES = (Public, ); }; }; + 968B3EA81DA89EC40099F8E5 /* GraphJSON.swift in Headers */ = {isa = PBXBuildFile; fileRef = 962EB9CF1D9E9E6800DFA8C4 /* GraphJSON.swift */; settings = {ATTRIBUTES = (Public, ); }; }; + 968B3EA91DA89ED40099F8E5 /* GraphJSON.swift in Headers */ = {isa = PBXBuildFile; fileRef = 962EB9CF1D9E9E6800DFA8C4 /* GraphJSON.swift */; settings = {ATTRIBUTES = (Public, ); }; }; 96E3C3B41D3AB41F0086A024 /* Graph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96E3C3A91D3AB41F0086A024 /* Graph.framework */; }; 96E3C3C81D3AB4860086A024 /* Graph.h in Headers */ = {isa = PBXBuildFile; fileRef = 96E3C3C61D3AB4860086A024 /* Graph.h */; settings = {ATTRIBUTES = (Public, ); }; }; 96E3C3DE1D3AB5280086A024 /* Graph.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96E3C3D41D3AB5280086A024 /* Graph.framework */; }; @@ -198,7 +198,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 962EB9CF1D9E9E6800DFA8C4 /* JSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSON.swift; sourceTree = ""; }; + 962EB9CF1D9E9E6800DFA8C4 /* GraphJSON.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GraphJSON.swift; sourceTree = ""; }; 965BBDC8208B96CF00AC4ED5 /* ActionPropertyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ActionPropertyTests.swift; path = Tests/ActionPropertyTests.swift; sourceTree = SOURCE_ROOT; }; 965BBDC9208B96CF00AC4ED5 /* ActionPropertyStressTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ActionPropertyStressTests.swift; path = Tests/ActionPropertyStressTests.swift; sourceTree = SOURCE_ROOT; }; 965BBDCA208B96CF00AC4ED5 /* ActionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ActionTests.swift; path = Tests/ActionTests.swift; sourceTree = SOURCE_ROOT; }; @@ -299,7 +299,7 @@ 962EB9CE1D9E9E5600DFA8C4 /* JSON */ = { isa = PBXGroup; children = ( - 962EB9CF1D9E9E6800DFA8C4 /* JSON.swift */, + 962EB9CF1D9E9E6800DFA8C4 /* GraphJSON.swift */, ); name = JSON; sourceTree = ""; @@ -518,7 +518,7 @@ 96F1DC5A1D64DDBC0025F925 /* ManagedActionProperty.swift in Headers */, 96F1DC5B1D64DDBC0025F925 /* ManagedActionTag.swift in Headers */, 96F1DC5C1D64DDBC0025F925 /* ManagedActionGroup.swift in Headers */, - 968B3EA81DA89EC40099F8E5 /* JSON.swift in Headers */, + 968B3EA81DA89EC40099F8E5 /* GraphJSON.swift in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -556,7 +556,7 @@ 96F1DC781D64DDCF0025F925 /* ManagedActionProperty.swift in Headers */, 96F1DC791D64DDCF0025F925 /* ManagedActionTag.swift in Headers */, 96F1DC7A1D64DDCF0025F925 /* ManagedActionGroup.swift in Headers */, - 968B3EA91DA89ED40099F8E5 /* JSON.swift in Headers */, + 968B3EA91DA89ED40099F8E5 /* GraphJSON.swift in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -736,7 +736,7 @@ 96E3C42C1D3AC6B60086A024 /* Entity.swift in Sources */, 96E3C4361D3AC6F20086A024 /* ManagedObject.swift in Sources */, 96E3C4441D3AC7E40086A024 /* ManagedRelationshipTag.swift in Sources */, - 962EB9D01D9E9E6800DFA8C4 /* JSON.swift in Sources */, + 962EB9D01D9E9E6800DFA8C4 /* GraphJSON.swift in Sources */, 96E3C3F41D3AB8B00086A024 /* Model.swift in Sources */, 968672101D3BEA8F000CD904 /* ManagedActionGroup.swift in Sources */, 96E3C4451D3AC7E40086A024 /* ManagedRelationshipProperty.swift in Sources */, @@ -803,7 +803,7 @@ 96E3C42D1D3AC6B70086A024 /* Entity.swift in Sources */, 96E3C4391D3AC6F30086A024 /* ManagedObject.swift in Sources */, 96E3C44C1D3AC7E50086A024 /* ManagedRelationshipTag.swift in Sources */, - 962EB9D11D9E9E6800DFA8C4 /* JSON.swift in Sources */, + 962EB9D11D9E9E6800DFA8C4 /* GraphJSON.swift in Sources */, 96E3C3F51D3AB8B00086A024 /* Model.swift in Sources */, 968672111D3BEA8F000CD904 /* ManagedActionGroup.swift in Sources */, 96E3C44D1D3AC7E50086A024 /* ManagedRelationshipProperty.swift in Sources */, diff --git a/Sources/JSON.swift b/Sources/GraphJSON.swift similarity index 82% rename from Sources/JSON.swift rename to Sources/GraphJSON.swift index bffa4ff0..d5ce8611 100644 --- a/Sources/JSON.swift +++ b/Sources/GraphJSON.swift @@ -30,10 +30,10 @@ import Foundation -open class JSON: Equatable, CustomStringConvertible { +open class GraphJSON: Equatable, CustomStringConvertible { /// A desiption of the object, used when printing. open var description: String { - return JSON.stringify(object: object) ?? "{}" + return GraphJSON.stringify(object: object) ?? "{}" } /// A reference to the core object. @@ -76,30 +76,30 @@ open class JSON: Equatable, CustomStringConvertible { /// A Data representation of the object. open var asNSData: Data? { - return JSON.serialize(object: object) + return GraphJSON.serialize(object: object) } /** Parses a given Data object. - Parameter _ data: A Data object. - Parameter options: JSONSerialization.ReadingOptions. - - Returns: A JSON object on success, nil otherwise. + - Returns: A GraphJSON object on success, nil otherwise. */ - open class func parse(_ data: Data, options: JSONSerialization.ReadingOptions = .allowFragments) -> JSON? { + open class func parse(_ data: Data, options: JSONSerialization.ReadingOptions = .allowFragments) -> GraphJSON? { guard let object = try? JSONSerialization.jsonObject(with: data, options: options) else { return nil } - return JSON(object) + return GraphJSON(object) } /** Parses a given String object. - Parameter _ string: A Data object. - Parameter options: JSONSerialization.ReadingOptions. - - Returns: A JSON object on success, nil otherwise. + - Returns: A GraphJSON object on success, nil otherwise. */ - open class func parse(_ string: String, options: JSONSerialization.ReadingOptions = .allowFragments) -> JSON? { + open class func parse(_ string: String, options: JSONSerialization.ReadingOptions = .allowFragments) -> GraphJSON? { guard let data = string.data(using: String.Encoding.utf8) else { return nil } @@ -122,20 +122,23 @@ open class JSON: Equatable, CustomStringConvertible { - Returns: A String object if successful, nil otherwise. */ open class func stringify(object: Any) -> String? { - if let o = object as? JSON { + if let o = object as? GraphJSON { return stringify(object: o.object) - } else if let data = JSON.serialize(object: object) { + + } else if let data = GraphJSON.serialize(object: object) { if let o = NSString(data: data, encoding: String.Encoding.utf8.rawValue) as String? { return o } } + return nil } /// An initializer that accepts a given Any object. public required init(_ object: Any) { - if let o = object as? JSON { + if let o = object as? GraphJSON { self.object = o.object + } else { self.object = object } @@ -144,22 +147,22 @@ open class JSON: Equatable, CustomStringConvertible { /** A subscript operator for Array style access. - Parameter index: An Int. - - Returns: A JSON object if successful, nil otherwise. + - Returns: A GraphJSON object if successful, nil otherwise. */ - open subscript(index: Int) -> JSON? { + open subscript(index: Int) -> GraphJSON? { guard let item = asArray else { return nil } - return JSON(item[index]) + return GraphJSON(item[index]) } /** A subscript operator for Dictionary style access. - Parameter key: A String. - - Returns: A JSON object if successful, nil otherwise. + - Returns: A GraphJSON object if successful, nil otherwise. */ - open subscript(key: String) -> JSON? { + open subscript(key: String) -> GraphJSON? { guard let item = asDictionary else { return nil } @@ -168,10 +171,10 @@ open class JSON: Equatable, CustomStringConvertible { return nil } - return JSON(item[key]!) + return GraphJSON(item[key]!) } } -public func ==(lhs: JSON, rhs: JSON) -> Bool { - return JSON.stringify(object: lhs.object) == JSON.stringify(object: rhs.object) +public func ==(lhs: GraphJSON, rhs: GraphJSON) -> Bool { + return GraphJSON.stringify(object: lhs.object) == GraphJSON.stringify(object: rhs.object) } diff --git a/Sources/Info.plist b/Sources/Info.plist index 51c40676..ad1b5554 100644 --- a/Sources/Info.plist +++ b/Sources/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.2.1 + 2.2.2 CFBundleSignature ???? CFBundleVersion diff --git a/Tests/ActionGroupTests.swift b/Tests/ActionGroupTests.swift index df2d15c3..931c76c2 100644 --- a/Tests/ActionGroupTests.swift +++ b/Tests/ActionGroupTests.swift @@ -144,7 +144,7 @@ class ActionGroupTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, addedTo group: String, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("G1", group) XCTAssertTrue(action.member(of: group)) XCTAssertEqual(1, action.groups.count) @@ -155,7 +155,7 @@ class ActionGroupTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, removedFrom group: String, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("G2", group) XCTAssertFalse(action.member(of: group)) diff --git a/Tests/ActionPropertyStressTests.swift b/Tests/ActionPropertyStressTests.swift index aa095a0d..12429f6e 100644 --- a/Tests/ActionPropertyStressTests.swift +++ b/Tests/ActionPropertyStressTests.swift @@ -140,7 +140,7 @@ class ActionPropertyStressTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, inserted action: Action, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual(0, action.properties.count) actionInsertExpectation?.fulfill() @@ -148,7 +148,7 @@ class ActionPropertyStressTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, deleted action: Action, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual(0, action.properties.count) actionDeleteExpectation?.fulfill() @@ -156,21 +156,21 @@ class ActionPropertyStressTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, added property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) propertyInsertExpception?.fulfill() } func watch(graph: Graph, action: Action, updated property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) propertyUpdateExpception?.fulfill() } func watch(graph: Graph, action: Action, removed property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) propertyDeleteExpception?.fulfill() } diff --git a/Tests/ActionPropertyTests.swift b/Tests/ActionPropertyTests.swift index 81942476..5a0680f7 100644 --- a/Tests/ActionPropertyTests.swift +++ b/Tests/ActionPropertyTests.swift @@ -140,7 +140,7 @@ class ActionPropertyTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, added property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("P1", property) XCTAssertEqual("V1", value as? String) @@ -151,7 +151,7 @@ class ActionPropertyTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, updated property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("P1", property) XCTAssertEqual("V2", value as? String) @@ -162,7 +162,7 @@ class ActionPropertyTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, removed property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("P1", property) XCTAssertEqual("V1", value as? String) diff --git a/Tests/ActionTagTests.swift b/Tests/ActionTagTests.swift index 30144ca8..1590dfe8 100644 --- a/Tests/ActionTagTests.swift +++ b/Tests/ActionTagTests.swift @@ -145,7 +145,7 @@ class ActionTagTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, added tag: String, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("G1", tag) XCTAssertTrue(action.has(tags: tag)) XCTAssertEqual(1, action.tags.count) @@ -156,7 +156,7 @@ class ActionTagTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, removed tag: String, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("G2", tag) XCTAssertFalse(action.has(tags: tag)) diff --git a/Tests/ActionTests.swift b/Tests/ActionTests.swift index aed012b4..0f8144ab 100644 --- a/Tests/ActionTests.swift +++ b/Tests/ActionTests.swift @@ -273,7 +273,7 @@ class ActionTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, inserted action: Action, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("V", action["P"] as? String) XCTAssertTrue(action.has(tags: "G")) @@ -282,7 +282,7 @@ class ActionTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, deleted action: Action, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertNil(action["P"]) XCTAssertFalse(action.has(tags: "G")) XCTAssertEqual(2, action.subjects.count) @@ -297,7 +297,7 @@ class ActionTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, added tag: String, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("G", tag) XCTAssertTrue(action.has(tags: tag)) @@ -306,7 +306,7 @@ class ActionTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, removed tag: String, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("G", tag) XCTAssertFalse(action.has(tags: tag)) @@ -315,7 +315,7 @@ class ActionTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, added property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("P", property) XCTAssertEqual("V", value as? String) XCTAssertEqual(value as? String, action[property] as? String) @@ -325,7 +325,7 @@ class ActionTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, updated property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("P", property) XCTAssertEqual("V", value as? String) XCTAssertEqual(value as? String, action[property] as? String) @@ -335,7 +335,7 @@ class ActionTests: XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, removed property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("P", property) XCTAssertEqual("V", value as? String) XCTAssertNil(action["P"]) diff --git a/Tests/ActionThreadTests.swift b/Tests/ActionThreadTests.swift index 9172bd79..4d954d7b 100644 --- a/Tests/ActionThreadTests.swift +++ b/Tests/ActionThreadTests.swift @@ -112,7 +112,7 @@ class ActionThreadTests : XCTestCase, WatchActionDelegate { func watch(graph: Graph, inserted action: Action, source: GraphSource) { XCTAssertEqual("T", action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual(111, action["P"] as? Int) XCTAssertTrue(action.has(tags: "G")) @@ -121,7 +121,7 @@ class ActionThreadTests : XCTestCase, WatchActionDelegate { func watch(graph: Graph, deleted action: Action, source: GraphSource) { XCTAssertEqual("T", action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertNil(action["P"]) XCTAssertFalse(action.has(tags: "G")) @@ -138,7 +138,7 @@ class ActionThreadTests : XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, removed tag: String, source: GraphSource) { XCTAssertEqual("T", action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("G", tag) XCTAssertFalse(action.has(tags: "G")) @@ -147,7 +147,7 @@ class ActionThreadTests : XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, added property: String, with value: Any, source: GraphSource) { XCTAssertEqual("T", action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("P", property) XCTAssertEqual(111, value as? Int) XCTAssertEqual(value as? Int, action[property] as? Int) @@ -157,7 +157,7 @@ class ActionThreadTests : XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, updated property: String, with value: Any, source: GraphSource) { XCTAssertEqual("T", action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("P", property) XCTAssertEqual(222, value as? Int) XCTAssertEqual(value as? Int, action[property] as? Int) @@ -167,7 +167,7 @@ class ActionThreadTests : XCTestCase, WatchActionDelegate { func watch(graph: Graph, action: Action, removed property: String, with value: Any, source: GraphSource) { XCTAssertEqual("T", action.type) - XCTAssertTrue(0 < action.id.characters.count) + XCTAssertTrue(0 < action.id.count) XCTAssertEqual("P", property) XCTAssertEqual(222, value as? Int) XCTAssertNil(action[property]) diff --git a/Tests/EntityGroupTests.swift b/Tests/EntityGroupTests.swift index 3040c114..8466be9b 100644 --- a/Tests/EntityGroupTests.swift +++ b/Tests/EntityGroupTests.swift @@ -144,7 +144,7 @@ class EntityGroupTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, addedTo group: String, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("G1", group) XCTAssertTrue(entity.member(of: group)) XCTAssertEqual(1, entity.groups.count) @@ -155,7 +155,7 @@ class EntityGroupTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, removedFrom group: String, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("G2", group) XCTAssertFalse(entity.member(of: group)) diff --git a/Tests/EntityPropertyStressTests.swift b/Tests/EntityPropertyStressTests.swift index 6d16b36a..d12f57bb 100644 --- a/Tests/EntityPropertyStressTests.swift +++ b/Tests/EntityPropertyStressTests.swift @@ -140,7 +140,7 @@ class EntityPropertyStressTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, inserted entity: Entity, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual(0, entity.properties.count) entityInsertExpectation?.fulfill() @@ -148,7 +148,7 @@ class EntityPropertyStressTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, deleted entity: Entity, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual(0, entity.properties.count) entityDeleteExpectation?.fulfill() @@ -156,21 +156,21 @@ class EntityPropertyStressTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, added property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) propertyInsertExpception?.fulfill() } func watch(graph: Graph, entity: Entity, updated property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) propertyUpdateExpception?.fulfill() } func watch(graph: Graph, entity: Entity, removed property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) propertyDeleteExpception?.fulfill() } diff --git a/Tests/EntityPropertyTests.swift b/Tests/EntityPropertyTests.swift index 73d74e22..80678688 100644 --- a/Tests/EntityPropertyTests.swift +++ b/Tests/EntityPropertyTests.swift @@ -140,7 +140,7 @@ class EntityPropertyTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, added property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("P1", property) XCTAssertEqual("V1", value as? String) @@ -151,7 +151,7 @@ class EntityPropertyTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, updated property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("P1", property) XCTAssertEqual("V2", value as? String) @@ -162,7 +162,7 @@ class EntityPropertyTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, removed property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("P1", property) XCTAssertEqual("V1", value as? String) diff --git a/Tests/EntityTagTests.swift b/Tests/EntityTagTests.swift index 91eba872..96bc7015 100644 --- a/Tests/EntityTagTests.swift +++ b/Tests/EntityTagTests.swift @@ -144,7 +144,7 @@ class EntityTagTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, added tag: String, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("G1", tag) XCTAssertTrue(entity.has(tags: tag)) XCTAssertEqual(1, entity.tags.count) @@ -155,7 +155,7 @@ class EntityTagTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, removed tag: String, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("G2", tag) XCTAssertFalse(entity.has(tags: tag)) diff --git a/Tests/EntityTests.swift b/Tests/EntityTests.swift index af66f9ed..825e328d 100644 --- a/Tests/EntityTests.swift +++ b/Tests/EntityTests.swift @@ -190,7 +190,7 @@ class EntityTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, inserted entity: Entity, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("V", entity["P"] as? String) XCTAssertTrue(entity.has(tags: "G")) @@ -199,7 +199,7 @@ class EntityTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, deleted entity: Entity, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertNil(entity["P"]) XCTAssertFalse(entity.has(tags: "G")) @@ -208,7 +208,7 @@ class EntityTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, added tag: String, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("G", tag) XCTAssertTrue(entity.has(tags: tag)) @@ -217,7 +217,7 @@ class EntityTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, removed tag: String, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("G", tag) XCTAssertFalse(entity.has(tags: tag)) @@ -226,7 +226,7 @@ class EntityTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, added property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("P", property) XCTAssertEqual("V", value as? String) XCTAssertEqual(value as? String, entity[property] as? String) @@ -236,7 +236,7 @@ class EntityTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, updated property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("P", property) XCTAssertEqual("V", value as? String) XCTAssertEqual(value as? String, entity[property] as? String) @@ -246,7 +246,7 @@ class EntityTests: XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, removed property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("P", property) XCTAssertEqual("V", value as? String) XCTAssertNil(entity["P"]) diff --git a/Tests/EntityThreadTests.swift b/Tests/EntityThreadTests.swift index 4955bc0a..5f707b0d 100644 --- a/Tests/EntityThreadTests.swift +++ b/Tests/EntityThreadTests.swift @@ -112,7 +112,7 @@ class EntityThreadTests : XCTestCase, WatchEntityDelegate { func watch(graph: Graph, inserted entity: Entity, source: GraphSource) { XCTAssertEqual("T", entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual(111, entity["P"] as? Int) XCTAssertTrue(entity.has(tags: "G")) @@ -121,7 +121,7 @@ class EntityThreadTests : XCTestCase, WatchEntityDelegate { func watch(graph: Graph, deleted entity: Entity, source: GraphSource) { XCTAssertEqual("T", entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertNil(entity["P"]) XCTAssertFalse(entity.has(tags: "G")) @@ -138,7 +138,7 @@ class EntityThreadTests : XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, removed tag: String, source: GraphSource) { XCTAssertEqual("T", entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("G", tag) XCTAssertFalse(entity.has(tags: "G")) @@ -147,7 +147,7 @@ class EntityThreadTests : XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, added property: String, with value: Any, source: GraphSource) { XCTAssertEqual("T", entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("P", property) XCTAssertEqual(111, value as? Int) XCTAssertEqual(value as? Int, entity[property] as? Int) @@ -157,7 +157,7 @@ class EntityThreadTests : XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, updated property: String, with value: Any, source: GraphSource) { XCTAssertEqual("T", entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("P", property) XCTAssertEqual(222, value as? Int) XCTAssertEqual(value as? Int, entity[property] as? Int) @@ -167,7 +167,7 @@ class EntityThreadTests : XCTestCase, WatchEntityDelegate { func watch(graph: Graph, entity: Entity, removed property: String, with value: Any, source: GraphSource) { XCTAssertEqual("T", entity.type) - XCTAssertTrue(0 < entity.id.characters.count) + XCTAssertTrue(0 < entity.id.count) XCTAssertEqual("P", property) XCTAssertEqual(222, value as? Int) XCTAssertNil(entity[property]) diff --git a/Tests/RelationshipGroupTests.swift b/Tests/RelationshipGroupTests.swift index 80a40129..fd7cc60a 100644 --- a/Tests/RelationshipGroupTests.swift +++ b/Tests/RelationshipGroupTests.swift @@ -144,7 +144,7 @@ class RelationshipGroupTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, addedTo group: String, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("G1", group) XCTAssertTrue(relationship.member(of: group)) XCTAssertEqual(1, relationship.groups.count) @@ -155,7 +155,7 @@ class RelationshipGroupTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, removedFrom group: String, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("G2", group) XCTAssertFalse(relationship.member(of: group)) diff --git a/Tests/RelationshipPropertyStressTests.swift b/Tests/RelationshipPropertyStressTests.swift index 4fc3f95b..917bdfe2 100644 --- a/Tests/RelationshipPropertyStressTests.swift +++ b/Tests/RelationshipPropertyStressTests.swift @@ -140,7 +140,7 @@ class RelationshipPropertyStressTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, inserted relationship: Relationship, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual(0, relationship.properties.count) relationshipInsertExpectation?.fulfill() @@ -148,7 +148,7 @@ class RelationshipPropertyStressTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, deleted relationship: Relationship, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual(0, relationship.properties.count) relationshipDeleteExpectation?.fulfill() @@ -156,21 +156,21 @@ class RelationshipPropertyStressTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, added property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) propertyInsertExpception?.fulfill() } func watch(graph: Graph, relationship: Relationship, updated property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) propertyUpdateExpception?.fulfill() } func watch(graph: Graph, relationship: Relationship, removed property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) propertyDeleteExpception?.fulfill() } diff --git a/Tests/RelationshipPropertyTests.swift b/Tests/RelationshipPropertyTests.swift index 14fb5be4..4cd03aa8 100644 --- a/Tests/RelationshipPropertyTests.swift +++ b/Tests/RelationshipPropertyTests.swift @@ -140,7 +140,7 @@ class RelationshipPropertyTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, added property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("P1", property) XCTAssertEqual("V1", value as? String) @@ -151,7 +151,7 @@ class RelationshipPropertyTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, updated property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("P1", property) XCTAssertEqual("V2", value as? String) @@ -162,7 +162,7 @@ class RelationshipPropertyTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, removed property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("P1", property) XCTAssertEqual("V1", value as? String) diff --git a/Tests/RelationshipTagTests.swift b/Tests/RelationshipTagTests.swift index 38075ef3..2dc6d5cc 100644 --- a/Tests/RelationshipTagTests.swift +++ b/Tests/RelationshipTagTests.swift @@ -144,7 +144,7 @@ class RelationshipTagTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, added tag: String, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("G1", tag) XCTAssertTrue(relationship.has(tags: tag)) XCTAssertEqual(1, relationship.tags.count) @@ -155,7 +155,7 @@ class RelationshipTagTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, removed tag: String, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("G2", tag) XCTAssertFalse(relationship.has(tags: tag)) diff --git a/Tests/RelationshipTests.swift b/Tests/RelationshipTests.swift index 06e2917d..62c1c153 100644 --- a/Tests/RelationshipTests.swift +++ b/Tests/RelationshipTests.swift @@ -306,7 +306,7 @@ class RelationshipTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, inserted relationship: Relationship, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("V", relationship["P"] as? String) XCTAssertTrue(relationship.has(tags: "G")) @@ -315,7 +315,7 @@ class RelationshipTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, updated relationship: Relationship, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("V", relationship["P"] as? String) XCTAssertTrue(relationship.has(tags: "G")) @@ -324,7 +324,7 @@ class RelationshipTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, deleted relationship: Relationship, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertNil(relationship["P"]) XCTAssertFalse(relationship.has(tags: "G")) XCTAssertNil(relationship.subject) @@ -337,7 +337,7 @@ class RelationshipTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, added tag: String, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("G", tag) XCTAssertTrue(relationship.has(tags: tag)) @@ -346,7 +346,7 @@ class RelationshipTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, removed tag: String, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("G", tag) XCTAssertFalse(relationship.has(tags: tag)) @@ -355,7 +355,7 @@ class RelationshipTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, added property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("P", property) XCTAssertEqual("V", value as? String) XCTAssertEqual(value as? String, relationship[property] as? String) @@ -365,7 +365,7 @@ class RelationshipTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, updated property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("P", property) XCTAssertEqual("V", value as? String) XCTAssertEqual(value as? String, relationship[property] as? String) @@ -375,7 +375,7 @@ class RelationshipTests: XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, removed property: String, with value: Any, source: GraphSource) { XCTAssertTrue("T" == relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("P", property) XCTAssertEqual("V", value as? String) XCTAssertNil(relationship["P"]) diff --git a/Tests/RelationshipThreadTests.swift b/Tests/RelationshipThreadTests.swift index 61733c1e..7b458b59 100644 --- a/Tests/RelationshipThreadTests.swift +++ b/Tests/RelationshipThreadTests.swift @@ -112,7 +112,7 @@ class RelationshipThreadTests : XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, inserted relationship: Relationship, source: GraphSource) { XCTAssertEqual("T", relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual(111, relationship["P"] as? Int) XCTAssertTrue(relationship.has(tags: "G")) @@ -121,7 +121,7 @@ class RelationshipThreadTests : XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, deleted relationship: Relationship, source: GraphSource) { XCTAssertEqual("T", relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertNil(relationship["P"]) XCTAssertFalse(relationship.has(tags: "G")) @@ -138,7 +138,7 @@ class RelationshipThreadTests : XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, removed tag: String, source: GraphSource) { XCTAssertEqual("T", relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("G", tag) XCTAssertFalse(relationship.has(tags: "G")) @@ -147,7 +147,7 @@ class RelationshipThreadTests : XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, added property: String, with value: Any, source: GraphSource) { XCTAssertEqual("T", relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("P", property) XCTAssertEqual(111, value as? Int) XCTAssertEqual(value as? Int, relationship[property] as? Int) @@ -157,7 +157,7 @@ class RelationshipThreadTests : XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, updated property: String, with value: Any, source: GraphSource) { XCTAssertEqual("T", relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("P", property) XCTAssertEqual(222, value as? Int) XCTAssertEqual(value as? Int, relationship[property] as? Int) @@ -167,7 +167,7 @@ class RelationshipThreadTests : XCTestCase, WatchRelationshipDelegate { func watch(graph: Graph, relationship: Relationship, removed property: String, with value: Any, source: GraphSource) { XCTAssertEqual("T", relationship.type) - XCTAssertTrue(0 < relationship.id.characters.count) + XCTAssertTrue(0 < relationship.id.count) XCTAssertEqual("P", property) XCTAssertEqual(222, value as? Int) XCTAssertNil(relationship[property])