Merge pull request #12 from polydice/feature/xctest

Replace Quick and Nimble with XCTest

Author: bcylin

CHANGELOG.md

@@ -2,15 +2,14 @@
 
 ## Develop Branch
 
-#### Added
-
 * Syntax check with SwiftLint [#3](https://github.com/polydice/iCook-tvOS/pull/3)
 * Code coverage
 * A little help from [Danger](http://danger.systems/) [#4](https://github.com/polydice/iCook-tvOS/pull/4)
 * Protocol extended features
 * Swift 3 syntax updates [#5](https://github.com/polydice/iCook-tvOS/pull/5)
 * Simpler project quick start [#6](https://github.com/polydice/iCook-tvOS/pull/6)
 * Replace Freddy with Swift Codable [#11](https://github.com/polydice/iCook-tvOS/pull/11)
+* Replace Quick and Nimble with XCTest [#12](https://github.com/polydice/iCook-tvOS/pull/12)
 
 ## v1.0.0
 

Podfile

@@ -17,8 +17,6 @@ target :iCookTV do
   pod "TreasureData-iOS-SDK", "0.1.15"
 
   target :iCookTVTests do
-    pod "Nimble"
-    pod "Quick"
     pod "SwiftLint", "0.24.0"
   end
 end

Podfile.lock

@@ -8,8 +8,6 @@ PODS:
   - KeenClientTD (3.2.27)
   - Keys (1.0.1)
   - Kingfisher (3.2.4)
-  - Nimble (7.0.3)
-  - Quick (1.2.0)
   - SwiftLint (0.24.0)
   - TreasureData-iOS-SDK (0.1.15):
     - KeenClientTD (= 3.2.27)
@@ -22,8 +20,6 @@ DEPENDENCIES:
   - Hue (~> 2.0.0)
   - Keys (from `Pods/CocoaPodsKeys`)
   - Kingfisher (~> 3.2.0)
-  - Nimble
-  - Quick
   - SwiftLint (= 0.24.0)
   - TreasureData-iOS-SDK (= 0.1.15)
 
@@ -40,11 +36,9 @@ SPEC CHECKSUMS:
   KeenClientTD: ddb29a702bd4cfce5d526519ca8959d70c324c6a
   Keys: a576f4c9c1c641ca913a959a9c62ed3f215a8de9
   Kingfisher: 8d80f39da403cd9c9ee11984e1655f4d6a566cdb
-  Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
-  Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
   SwiftLint: a014c92b4664e8b13f380f8640a51bb1733778ba
   TreasureData-iOS-SDK: cc878af36b85ae3540a9a5bdb36b7bdc8707b719
 
-PODFILE CHECKSUM: 3ed7b21c8acb46a6e14e06ff31e882ac9d392b95
+PODFILE CHECKSUM: e5951c6489057187d3b6c52cfcfe304dc59eb489
 
 COCOAPODS: 1.3.1

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 */,
 			);
@@ -597,8 +594,6 @@
 				"${BUILT_PRODUCTS_DIR}/Keys/Keys.framework",
 				"${BUILT_PRODUCTS_DIR}/Kingfisher/Kingfisher.framework",
 				"${BUILT_PRODUCTS_DIR}/TreasureData-iOS-SDK/TreasureData_iOS_SDK.framework",
-				"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
-				"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -609,8 +604,6 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Keys.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Kingfisher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TreasureData_iOS_SDK.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -696,7 +689,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\"]"))
   }
 
 }