Convert model specs to XCTestCases

Author: bcylin

iCookTV.xcodeproj/project.pbxproj

@@ -65,7 +65,6 @@
 		B5EFE6C21DC600FF00236D1A /* VideosGridLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5EFE6C11DC600FF00236D1A /* VideosGridLayout.swift */; };
 		B5F7BF4C1BA9C95F00A75099 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F7BF4B1BA9C95F00A75099 /* AppDelegate.swift */; };
 		B5F7BF531BA9C95F00A75099 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B5F7BF521BA9C95F00A75099 /* Assets.xcassets */; };
-		B5F7BF5E1BA9C95F00A75099 /* iCookTVTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5F7BF5D1BA9C95F00A75099 /* iCookTVTests.swift */; };
 		E0CC9B4F972579066B42862A /* Pods_iCookTV.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1068EAEDE861A2EEA0CF2228 /* Pods_iCookTV.framework */; };
 /* End PBXBuildFile section */
 
@@ -149,7 +148,6 @@
 		B5F7BF521BA9C95F00A75099 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		B5F7BF541BA9C95F00A75099 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		B5F7BF591BA9C95F00A75099 /* iCookTV.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iCookTV.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		B5F7BF5D1BA9C95F00A75099 /* iCookTVTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iCookTVTests.swift; sourceTree = "<group>"; };
 		B5F7BF5F1BA9C95F00A75099 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CCC5F61AC4253D5EB2FF6C5F /* Pods_iCookTV_iCookTVTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iCookTV_iCookTVTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		F631C183B75D6A45DF934799 /* Pods-iCookTV-iCookTVTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iCookTV-iCookTVTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-iCookTV-iCookTVTests/Pods-iCookTV-iCookTVTests.release.xcconfig"; sourceTree = "<group>"; };
@@ -347,7 +345,6 @@
 				B5761A521CCF4D3D008CCC08 /* CategorySpec.swift */,
 				B52BD6801D60B62E0023D4E9 /* DataCollectionSpec.swift */,
 				B52BD67E1D6034A10023D4E9 /* DataSourceSpec.swift */,
-				B5F7BF5D1BA9C95F00A75099 /* iCookTVTests.swift */,
 				B5761A571CCF5752008CCC08 /* ResourceHelper.swift */,
 				B5761A591CCF6CCD008CCC08 /* VideoSpec.swift */,
 			);
@@ -696,7 +693,6 @@
 				B5761A531CCF4D3D008CCC08 /* CategorySpec.swift in Sources */,
 				B52BD6811D60B62E0023D4E9 /* DataCollectionSpec.swift in Sources */,
 				B52BD67F1D6034A10023D4E9 /* DataSourceSpec.swift in Sources */,
-				B5F7BF5E1BA9C95F00A75099 /* iCookTVTests.swift in Sources */,
 				B5761A581CCF5752008CCC08 /* ResourceHelper.swift in Sources */,
 				B5761A5A1CCF6CCD008CCC08 /* VideoSpec.swift in Sources */,
 			);

iCookTV/Models/Category.swift

@@ -26,13 +26,16 @@
 
 import Foundation
 
-struct Category: Codable {
+struct Category {
 
   let id: String
   let name: String
   let coverURLs: [String]
 
-  // MARK: - Codable
+}
+
+
+extension Category: Codable {
 
   private enum CodingKeys: String, CodingKey {
     case id
@@ -44,6 +47,8 @@ struct Category: Codable {
     case coverURLs = "cover-urls"
   }
 
+  // MARK: - Decodable
+
   init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
     id = try container.decode(String.self, forKey: .id)
@@ -53,6 +58,8 @@ struct Category: Codable {
     coverURLs = try attributes.decode([String].self, forKey: .coverURLs)
   }
 
+  // MARK: - Encodable
+
   func encode(to encoder: Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
     try container.encode(id, forKey: .id)

iCookTV/Models/Video.swift

@@ -26,7 +26,7 @@
 
 import Foundation
 
-struct Video: Codable {
+struct Video {
 
   let id: String
   let title: String
@@ -48,7 +48,10 @@ struct Video: Codable {
     return (hours > 0 ? "\(hours):" : "") + String(format: "%d:%02d", minutes, seconds)
   }
 
-  // MARK: - Codable
+}
+
+
+extension Video: Codable {
 
   private enum CodingKeys: String, CodingKey {
     case id
@@ -65,6 +68,8 @@ struct Video: Codable {
     case cover = "cover-url"
   }
 
+  // MARK: - Decodable
+
   init(from decoder: Decoder) throws {
     let container = try decoder.container(keyedBy: CodingKeys.self)
     id = try container.decode(String.self, forKey: .id)
@@ -79,6 +84,8 @@ struct Video: Codable {
     cover = try attributes.decode(String.self, forKey: .cover)
   }
 
+  // MARK: - Encodable
+
   func encode(to encoder: Encoder) throws {
     var container = encoder.container(keyedBy: CodingKeys.self)
     try container.encode(id, forKey: .id)

iCookTVTests/CategorySpec.swift

@@ -25,31 +25,50 @@
 //
 
 @testable import iCookTV
-import Nimble
-import Quick
+import XCTest
 
-class CategorySpec: QuickSpec {
-
-  override func spec() {
+final class CategorySpec: XCTestCase {
 
+  func testDecoding() throws {
+    // Given Category.json
     let data: Data = Resources.testData(named: "Category.json")!
 
-    describe("decoding") {
-      it("should parse JSON as Category") {
-        let decoder = JSONDecoder()
-        let category = try! decoder.decode(Category.self, from: data)
-
-        expect(category.id).to(equal("9527"))
-        expect(category.name).to(equal("愛料理廚房"))
-        expect(category.coverURLs).to(equal([
-          "https://imag.es/1.jpg",
-          "https://imag.es/2.jpg",
-          "https://imag.es/3.jpg",
-          "https://imag.es/4.jpg"
-        ]))
-      }
-    }
+    // When decoding
+    let decoder = JSONDecoder()
+    let category = try decoder.decode(Category.self, from: data)
+
+    // It should parse JSON as Category
+    XCTAssertEqual(category.id, "9527")
+    XCTAssertEqual(category.name, "愛料理廚房")
+    XCTAssertEqual(category.coverURLs, [
+      "https://imag.es/1.jpg",
+      "https://imag.es/2.jpg",
+      "https://imag.es/3.jpg",
+      "https://imag.es/4.jpg"
+    ])
+  }
+
+  func testEncoding() throws {
+    // Given a Category object
+    let category = Category(
+      id: "9527",
+      name: "愛料理廚房",
+      coverURLs: [
+        "https://imag.es/1.jpg",
+        "https://imag.es/2.jpg"
+      ]
+    )
+
+    // When encoding
+    let encoder = JSONEncoder()
+    let json = try encoder.encode(category)
+    let jsonString = String(data: json, encoding: .utf8)
 
+    // It should encode Category to JSON
+    XCTAssert(jsonString!.contains("\"id\":\"9527\""))
+    XCTAssert(jsonString!.contains("\"attributes\":{"))
+    XCTAssert(jsonString!.contains("\"name\":\"愛料理廚房\""))
+    XCTAssert(jsonString!.contains("\"cover-urls\":[\"https:\\/\\/imag.es\\/1.jpg\",\"https:\\/\\/imag.es\\/2.jpg\"]"))
   }
 
 }

iCookTVTests/VideoSpec.swift

@@ -25,47 +25,56 @@
 //
 
 @testable import iCookTV
-import Nimble
-import Quick
+import XCTest
 
-class VideoSpec: QuickSpec {
-
-  override func spec() {
+final class VideoSpec: XCTestCase {
 
+  func testDecoding() throws {
+    // Given Video.json
     let data: Data = Resources.testData(named: "Video.json")!
+
+    // When decoding
     let decoder = JSONDecoder()
     let video = try! decoder.decode(Video.self, from: data)
 
-    describe("decoding") {
-      it("should parse JSON as Video") {
-        expect(video.id).to(equal("42"))
-        expect(video.title).to(equal("Lorem"))
-        expect(video.subtitle).to(equal("ipsum"))
-        expect(video.description).to(equal("dolor sit amet"))
-        expect(video.length).to(equal(123))
-        expect(video.youtube).to(equal("https://www.youtube.com/watch?v=3345678"))
-        expect(video.source).to(equal("https://vide.os/source.m3u8"))
-        expect(video.cover).to(equal("https://imag.es/cover.jpg"))
-      }
-    }
+    // It should parse JSON as Video
+    XCTAssertEqual(video.id, "42")
+    XCTAssertEqual(video.title, "Lorem")
+    XCTAssertEqual(video.subtitle, "ipsum")
+    XCTAssertEqual(video.description, "dolor sit amet")
+    XCTAssertEqual(video.length, 123)
+    XCTAssertEqual(video.youtube, "https://www.youtube.com/watch?v=3345678")
+    XCTAssertEqual(video.source, "https://vide.os/source.m3u8")
+    XCTAssertEqual(video.cover, "https://imag.es/cover.jpg")
+  }
 
-    describe("encoding") {
-      let encoder = JSONEncoder()
-      let data = try! encoder.encode(video)
-      let jsonString = String(data: data, encoding: .utf8)
+  func testEncoding() throws {
+    // Given a Video object
+    let video = Video(
+      id: "42",
+      title: "Lorem",
+      subtitle: "ipsum",
+      description: "dolor sit amet",
+      length: 123,
+      youtube: "https://www.youtube.com/watch?v=3345678",
+      source: "https://vide.os/source.m3u8",
+      cover: "https://imag.es/cover.jpg"
+    )
 
-      it("should encode Video to JSON") {
-        expect(jsonString).to(contain("\"id\":\"42\""))
-        expect(jsonString).to(contain("\"title\":\"Lorem\""))
-        expect(jsonString).to(contain("\"subtitle\":\"ipsum\""))
-        expect(jsonString).to(contain("\"description\":\"dolor sit amet\""))
-        expect(jsonString).to(contain("\"length\":123"))
-        expect(jsonString).to(contain("\"embed-url\":\"https:\\/\\/www.youtube.com\\/watch?v=3345678\""))
-        expect(jsonString).to(contain("\"video-url\":\"https:\\/\\/vide.os\\/source.m3u8\""))
-        expect(jsonString).to(contain("\"cover-url\":\"https:\\/\\/imag.es\\/cover.jpg\""))
-      }
-    }
+    // When encoding
+    let encoder = JSONEncoder()
+    let json = try encoder.encode(video)
+    let jsonString = String(data: json, encoding: .utf8)
 
+    // It should encode Video to JSON
+    XCTAssert(jsonString!.contains("\"id\":\"42\""))
+    XCTAssert(jsonString!.contains("\"title\":\"Lorem\""))
+    XCTAssert(jsonString!.contains("\"subtitle\":\"ipsum\""))
+    XCTAssert(jsonString!.contains("\"description\":\"dolor sit amet\""))
+    XCTAssert(jsonString!.contains("\"length\":123"))
+    XCTAssert(jsonString!.contains("\"embed-url\":\"https:\\/\\/www.youtube.com\\/watch?v=3345678\""))
+    XCTAssert(jsonString!.contains("\"video-url\":\"https:\\/\\/vide.os\\/source.m3u8\""))
+    XCTAssert(jsonString!.contains("\"cover-url\":\"https:\\/\\/imag.es\\/cover.jpg\""))
   }
 
 }