Skip to content

Commit 945a27b

Browse files
mythzmythz
committed
Import more tests
1 parent 9737b28 commit 945a27b

16 files changed

Lines changed: 2515 additions & 110 deletions

‎ServiceStackClient.xcodeproj/project.pbxproj‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@
2020
51D0C4061DCF99180054C26D /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = OBJ_23 /* PromiseKit.framework */; };
2121
51D0C40B1DCFD6170054C26D /* AssertUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C4071DCFD4810054C26D /* AssertUtils.swift */; };
2222
51D0C40C1DCFD61B0054C26D /* DateExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C4081DCFD4810054C26D /* DateExtensionsTests.swift */; };
23+
51D0C40F1DCFD9280054C26D /* JsonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C40D1DCFD9220054C26D /* JsonTests.swift */; };
24+
51D0C4121DCFDFD10054C26D /* SerializeParentChildTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C4101DCFDFCC0054C26D /* SerializeParentChildTests.swift */; };
25+
51D0C4151DCFE1180054C26D /* StringExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C4131DCFE1100054C26D /* StringExtensionsTests.swift */; };
26+
51D0C41A1DCFE3AD0054C26D /* NativeExtensionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C4161DCFE3A90054C26D /* NativeExtensionsTests.swift */; };
27+
51D0C41B1DCFE3B60054C26D /* Template.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C4171DCFE3A90054C26D /* Template.swift */; };
28+
51D0C4241DCFE8510054C26D /* ServiceClientTechStacksTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C41C1DCFE84B0054C26D /* ServiceClientTechStacksTests.swift */; };
29+
51D0C4251DCFE8550054C26D /* TechStacks.dtos.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C41D1DCFE84B0054C26D /* TechStacks.dtos.swift */; };
30+
51D0C4261DCFE85A0054C26D /* TechStacksDtosJsonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C41E1DCFE84B0054C26D /* TechStacksDtosJsonTests.swift */; };
31+
51D0C4271DCFE85E0054C26D /* TechStacksJsonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D0C41F1DCFE84B0054C26D /* TechStacksJsonTests.swift */; };
32+
51D0C4281DCFEDDE0054C26D /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = OBJ_23 /* PromiseKit.framework */; };
33+
51D0C42B1DCFF0D30054C26D /* overview.json in Resources */ = {isa = PBXBuildFile; fileRef = 51D0C4291DCFF0BC0054C26D /* overview.json */; };
2334
OBJ_29 /* after.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* after.swift */; };
2435
OBJ_30 /* DispatchQueue+Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* DispatchQueue+Promise.swift */; };
2536
OBJ_31 /* Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_11 /* Error.swift */; };
@@ -59,6 +70,16 @@
5970
51D0C4041DCF94E40054C26D /* ServiceStackClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ServiceStackClient.h; path = ServiceStackClient/ServiceStackClient.h; sourceTree = "<group>"; };
6071
51D0C4071DCFD4810054C26D /* AssertUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AssertUtils.swift; path = ServiceStackClientTests/AssertUtils.swift; sourceTree = "<group>"; };
6172
51D0C4081DCFD4810054C26D /* DateExtensionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DateExtensionsTests.swift; path = ServiceStackClientTests/DateExtensionsTests.swift; sourceTree = "<group>"; };
73+
51D0C40D1DCFD9220054C26D /* JsonTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JsonTests.swift; path = ServiceStackClientTests/JsonTests.swift; sourceTree = "<group>"; };
74+
51D0C4101DCFDFCC0054C26D /* SerializeParentChildTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SerializeParentChildTests.swift; path = ServiceStackClientTests/SerializeParentChildTests.swift; sourceTree = "<group>"; };
75+
51D0C4131DCFE1100054C26D /* StringExtensionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StringExtensionsTests.swift; path = ServiceStackClientTests/StringExtensionsTests.swift; sourceTree = "<group>"; };
76+
51D0C4161DCFE3A90054C26D /* NativeExtensionsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NativeExtensionsTests.swift; path = ServiceStackClientTests/NativeExtensionsTests.swift; sourceTree = "<group>"; };
77+
51D0C4171DCFE3A90054C26D /* Template.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Template.swift; path = ServiceStackClientTests/Template.swift; sourceTree = "<group>"; };
78+
51D0C41C1DCFE84B0054C26D /* ServiceClientTechStacksTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ServiceClientTechStacksTests.swift; path = ServiceStackClientTests/ServiceClientTechStacksTests.swift; sourceTree = "<group>"; };
79+
51D0C41D1DCFE84B0054C26D /* TechStacks.dtos.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TechStacks.dtos.swift; path = ServiceStackClientTests/TechStacks.dtos.swift; sourceTree = "<group>"; };
80+
51D0C41E1DCFE84B0054C26D /* TechStacksDtosJsonTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TechStacksDtosJsonTests.swift; path = ServiceStackClientTests/TechStacksDtosJsonTests.swift; sourceTree = "<group>"; };
81+
51D0C41F1DCFE84B0054C26D /* TechStacksJsonTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TechStacksJsonTests.swift; path = ServiceStackClientTests/TechStacksJsonTests.swift; sourceTree = "<group>"; };
82+
51D0C4291DCFF0BC0054C26D /* overview.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = overview.json; path = ServiceStackClientTests/overview.json; sourceTree = "<group>"; };
6283
OBJ_10 /* DispatchQueue+Promise.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DispatchQueue+Promise.swift"; sourceTree = "<group>"; };
6384
OBJ_11 /* Error.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Error.swift; sourceTree = "<group>"; };
6485
OBJ_12 /* join.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = join.swift; sourceTree = "<group>"; };
@@ -88,6 +109,7 @@
88109
isa = PBXFrameworksBuildPhase;
89110
buildActionMask = 2147483647;
90111
files = (
112+
51D0C4281DCFEDDE0054C26D /* PromiseKit.framework in Frameworks */,
91113
51D0C3D61DCF91450054C26D /* ServiceStackClient.framework in Frameworks */,
92114
);
93115
runOnlyForDeploymentPostprocessing = 0;
@@ -105,6 +127,16 @@
105127
51D0C3E51DCF92DB0054C26D /* ServiceStackClientTests */ = {
106128
isa = PBXGroup;
107129
children = (
130+
51D0C4291DCFF0BC0054C26D /* overview.json */,
131+
51D0C41C1DCFE84B0054C26D /* ServiceClientTechStacksTests.swift */,
132+
51D0C41D1DCFE84B0054C26D /* TechStacks.dtos.swift */,
133+
51D0C41E1DCFE84B0054C26D /* TechStacksDtosJsonTests.swift */,
134+
51D0C41F1DCFE84B0054C26D /* TechStacksJsonTests.swift */,
135+
51D0C4161DCFE3A90054C26D /* NativeExtensionsTests.swift */,
136+
51D0C4171DCFE3A90054C26D /* Template.swift */,
137+
51D0C4131DCFE1100054C26D /* StringExtensionsTests.swift */,
138+
51D0C4101DCFDFCC0054C26D /* SerializeParentChildTests.swift */,
139+
51D0C40D1DCFD9220054C26D /* JsonTests.swift */,
108140
51D0C4071DCFD4810054C26D /* AssertUtils.swift */,
109141
51D0C4081DCFD4810054C26D /* DateExtensionsTests.swift */,
110142
51D0C3E81DCF92F40054C26D /* Info.plist */,
@@ -302,6 +334,7 @@
302334
isa = PBXResourcesBuildPhase;
303335
buildActionMask = 2147483647;
304336
files = (
337+
51D0C42B1DCFF0D30054C26D /* overview.json in Resources */,
305338
51D0C3EA1DCF92FF0054C26D /* Info.plist in Resources */,
306339
);
307340
runOnlyForDeploymentPostprocessing = 0;
@@ -326,9 +359,18 @@
326359
isa = PBXSourcesBuildPhase;
327360
buildActionMask = 2147483647;
328361
files = (
362+
51D0C4261DCFE85A0054C26D /* TechStacksDtosJsonTests.swift in Sources */,
363+
51D0C4151DCFE1180054C26D /* StringExtensionsTests.swift in Sources */,
364+
51D0C4121DCFDFD10054C26D /* SerializeParentChildTests.swift in Sources */,
365+
51D0C41A1DCFE3AD0054C26D /* NativeExtensionsTests.swift in Sources */,
366+
51D0C4251DCFE8550054C26D /* TechStacks.dtos.swift in Sources */,
329367
51D0C3E91DCF92FD0054C26D /* ServiceStackClientTests.swift in Sources */,
330368
51D0C40B1DCFD6170054C26D /* AssertUtils.swift in Sources */,
369+
51D0C41B1DCFE3B60054C26D /* Template.swift in Sources */,
331370
51D0C40C1DCFD61B0054C26D /* DateExtensionsTests.swift in Sources */,
371+
51D0C4241DCFE8510054C26D /* ServiceClientTechStacksTests.swift in Sources */,
372+
51D0C4271DCFE85E0054C26D /* TechStacksJsonTests.swift in Sources */,
373+
51D0C40F1DCFD9280054C26D /* JsonTests.swift in Sources */,
332374
);
333375
runOnlyForDeploymentPostprocessing = 0;
334376
};

‎Sources/ServiceStackClient/DateExtensions.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public extension Date {
7777
return dateFormatter.string(from: self as Date).appendingFormat("Z")
7878
}
7979

80-
public static func fromIsoDateString(string:String) -> Date? {
80+
public static func fromIsoDateString(_ string:String) -> Date? {
8181
let isUtc = string.hasSuffix("Z")
8282
let dateFormatter = DateFormatter()
8383
dateFormatter.locale = NSLocale(localeIdentifier: "en_US_POSIX") as Locale!

‎Sources/ServiceStackClient/Json.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -292,16 +292,16 @@ extension Date : StringSerializable
292292
: string
293293
let wcfJsonPrefix = "/Date("
294294
if str.hasPrefix(wcfJsonPrefix) {
295-
let body = str.splitOnFirst(separator: "(")[1].splitOnLast(separator: ")")[0]
295+
let body = str.splitOn(first: "(")[1].splitOn(last: ")")[0]
296296
let unixTime = (
297297
body
298-
.splitOnFirst(separator: "-", startIndex:1)[0]
299-
.splitOnFirst(separator: "+", startIndex:1)[0] as NSString
298+
.splitOn(first: "-", startIndex:1)[0]
299+
.splitOn(first: "+", startIndex:1)[0] as NSString
300300
).doubleValue
301301
return Date(timeIntervalSince1970: unixTime / 1000) //ms -> secs
302302
}
303303

304-
return Date.fromIsoDateString(string: string)
304+
return Date.fromIsoDateString(string)
305305
}
306306

307307
public static func fromObject(_ any:Any) -> Date?
@@ -403,33 +403,33 @@ extension TimeInterval
403403
var seconds = 0
404404
var ms = 0.0
405405

406-
let t = string[1..<string.length].splitOnFirst(separator: "T") //strip P
406+
let t = string[1..<string.length].splitOn(first: "T") //strip P
407407

408408
let hasTime = t.count == 2
409409

410-
let d = t[0].splitOnFirst(separator: "D")
410+
let d = t[0].splitOn(first: "D")
411411
if d.count == 2 {
412412
if let day = Int(d[0]) {
413413
days = day
414414
}
415415
}
416416

417417
if hasTime {
418-
let h = t[1].splitOnFirst(separator: "H")
418+
let h = t[1].splitOn(first: "H")
419419
if h.count == 2 {
420420
if let hour = Int(h[0]) {
421421
hours = hour
422422
}
423423
}
424424

425-
let m = h.last!.splitOnFirst(separator: "M")
425+
let m = h.last!.splitOn(first: "M")
426426
if m.count == 2 {
427427
if let min = Int(m[0]) {
428428
minutes = min
429429
}
430430
}
431431

432-
let s = m.last!.splitOnFirst(separator: "S")
432+
let s = m.last!.splitOn(first: "S")
433433
if s.count == 2 {
434434
ms = s[0].toDouble()
435435
}

0 commit comments

Comments
 (0)