Fixes for tests

matthewcheok · matthewcheok · commit 000982cba8a1 · 2015-12-10T22:21:05.000-08:00
diff --git a/JSONCodable/JSONDecodable.swift b/JSONCodable/JSONDecodable.swift
@@ -52,9 +52,9 @@ public protocol JSONDecodable {
 }
 
 public extension JSONDecodable {
-    init?(JSONDictionary: JSONObject) {
+    public init?(optional: JSONObject) {
         do {
-            try self.init(object: JSONDictionary)
+            try self.init(object: optional)
         } catch {
             return nil
         }
diff --git a/JSONCodableTests/Company.swift b/JSONCodableTests/Company.swift
@@ -21,14 +21,9 @@ func ==(lhs: Company, rhs: Company) -> Bool {
 extension Company: JSONEncodable {}
 
 extension Company: JSONDecodable {
-    init?(JSONDictionary: JSONObject) {
-        let decoder = JSONDecoder(object: JSONDictionary)
-        do {
-            name = try decoder.decode("name")
-            address = try decoder.decode("address")
-        }
-        catch {
-            return nil
-        }
+    init(object: JSONObject) throws {
+        let decoder = JSONDecoder(object: object)
+        name = try decoder.decode("name")
+        address = try decoder.decode("address")
     }
 }
diff --git a/JSONCodableTests/EnumTests.swift b/JSONCodableTests/EnumTests.swift
@@ -17,14 +17,15 @@ class EnumTests: XCTestCase {
     let decodedValue2 = Food(name: "Seaweed Pasta", cuisines: [.Italian, .Japanese])
     
     func testDecodingEnum() {
-        guard let fruit = Fruit(JSONDictionary: encodedValue) else {
+        let a = Fruit(optional: encodedValue)
+        guard let fruit = Fruit(optional: encodedValue) else {
             XCTFail()
             return
         }
         
         XCTAssertEqual(fruit, decodedValue)
         
-        guard let food = Food(JSONDictionary: encodedValue2) else {
+        guard let food = Food(optional: encodedValue2) else {
             XCTFail()
             return
         }
diff --git a/JSONCodableTests/Food.swift b/JSONCodableTests/Food.swift
@@ -32,15 +32,10 @@ func ==(lhs: Food, rhs: Food) -> Bool {
 }
 
 extension Food: JSONCodable {
-    init?(JSONDictionary: JSONObject) {
-        let decoder = JSONDecoder(object: JSONDictionary)
-        do {
-            name = try decoder.decode("name")
-            cuisines = try decoder.decode("cuisines")
-        }
-        catch {
-            return nil
-        }
+    init(object: JSONObject) throws {
+        let decoder = JSONDecoder(object: object)
+        name = try decoder.decode("name")
+        cuisines = try decoder.decode("cuisines")
     }
     
     func toJSON() throws -> AnyObject {
diff --git a/JSONCodableTests/Fruit.swift b/JSONCodableTests/Fruit.swift
@@ -24,15 +24,10 @@ func ==(lhs: Fruit, rhs: Fruit) -> Bool {
 }
 
 extension Fruit: JSONCodable {
-    init?(JSONDictionary: JSONObject) {
-        let decoder = JSONDecoder(object: JSONDictionary)
-        do {
-            name = try decoder.decode("name")
-            color = try decoder.decode("color")
-        }
-        catch {
-            return nil
-        }
+    init(object: JSONObject) throws {
+        let decoder = JSONDecoder(object: object)
+        name = try decoder.decode("name")
+        color = try decoder.decode("color")
     }
     
     func toJSON() throws -> AnyObject {
diff --git a/JSONCodableTests/ImageAsset.swift b/JSONCodableTests/ImageAsset.swift
@@ -28,14 +28,9 @@ extension ImageAsset: JSONEncodable {
 }
 
 extension ImageAsset: JSONDecodable {
-    init?(JSONDictionary: JSONObject) {
-        let decoder = JSONDecoder(object: JSONDictionary)
-        do {
-            name = try decoder.decode("name")
-            uri = try decoder.decode("uri", transformer: JSONTransformers.StringToNSURL)
-        }
-        catch {
-            return nil
-        }
+    init(object: JSONObject) throws {
+        let decoder = JSONDecoder(object: object)
+        name = try decoder.decode("name")
+        uri = try decoder.decode("uri", transformer: JSONTransformers.StringToNSURL)
     }
 }
diff --git a/JSONCodableTests/RegularTests.swift b/JSONCodableTests/RegularTests.swift
@@ -34,7 +34,7 @@ class RegularTests: XCTestCase {
         ])
 
     func testDecodingRegular() {
-        guard let user = User(JSONDictionary: encodedValue) else {
+        guard let user = User(optional: encodedValue) else {
             XCTFail()
             return
         }
diff --git a/JSONCodableTests/TransformerTests.swift b/JSONCodableTests/TransformerTests.swift
@@ -20,7 +20,7 @@ class TransformerTests: XCTestCase {
     )
     
     func testDecodingTransformer() {
-        guard let asset = ImageAsset(JSONDictionary: encodedValue) else {
+        guard let asset = ImageAsset(optional: encodedValue) else {
             XCTFail()
             return
         }
diff --git a/JSONCodableTests/User.swift b/JSONCodableTests/User.swift
@@ -38,17 +38,12 @@ extension User: JSONEncodable {
 }
 
 extension User: JSONDecodable {
-    init?(JSONDictionary: JSONObject) {
-        let decoder = JSONDecoder(object: JSONDictionary)        
-        do {
-            id = try decoder.decode("id")
-            name = try decoder.decode("full_name")
-            email = try decoder.decode("email")
-            company = try decoder.decode("company")
-            friends = try decoder.decode("friends")
-        }
-        catch {
-            return nil
-        }
+    init(object: JSONObject) throws {
+        let decoder = JSONDecoder(object: object)        
+        id = try decoder.decode("id")
+        name = try decoder.decode("full_name")
+        email = try decoder.decode("email")
+        company = try decoder.decode("company")
+        friends = try decoder.decode("friends")
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,9 @@ public protocol JSONDecodable {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public extension JSONDecodable {`
`55`		`- init?(JSONDictionary: JSONObject) {`
	`55`	`+ public init?(optional: JSONObject) {`
`56`	`56`	`do {`
`57`		`- try self.init(object: JSONDictionary)`
	`57`	`+ try self.init(object: optional)`
`58`	`58`	`} catch {`
`59`	`59`	`return nil`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,9 @@ extension ImageAsset: JSONEncodable {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`extension ImageAsset: JSONDecodable {`
`31`		`- init?(JSONDictionary: JSONObject) {`
`32`		`- let decoder = JSONDecoder(object: JSONDictionary)`
`33`		`- do {`
`34`		`- name = try decoder.decode("name")`
`35`		`- uri = try decoder.decode("uri", transformer: JSONTransformers.StringToNSURL)`
`36`		`- }`
`37`		`- catch {`
`38`		`- return nil`
`39`		`- }`
	`31`	`+ init(object: JSONObject) throws {`
	`32`	`+ let decoder = JSONDecoder(object: object)`
	`33`	`+ name = try decoder.decode("name")`
	`34`	`+ uri = try decoder.decode("uri", transformer: JSONTransformers.StringToNSURL)`
`40`	`35`	`}`
`41`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class RegularTests: XCTestCase {`
`34`	`34`	`])`
`35`	`35`
`36`	`36`	`func testDecodingRegular() {`
`37`		`- guard let user = User(JSONDictionary: encodedValue) else {`
	`37`	`+ guard let user = User(optional: encodedValue) else {`
`38`	`38`	`XCTFail()`
`39`	`39`	`return`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class TransformerTests: XCTestCase {`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`func testDecodingTransformer() {`
`23`		`- guard let asset = ImageAsset(JSONDictionary: encodedValue) else {`
	`23`	`+ guard let asset = ImageAsset(optional: encodedValue) else {`
`24`	`24`	`XCTFail()`
`25`	`25`	`return`
`26`	`26`	`}`