Codecov update (#15)

hcn1519 · web-flow · commit 5963534e31aa · 2018-02-23T18:47:34.000+09:00
* test: Add codecove.yml and Update Unit tests.

* [Documentation]: Add Code Of Conduct.md

* [Documentation]: Update travis.yml

* [Documentation]: Update .travis.yml

* Update script of travis.yml

* Update testing and travis yml

* Update typo

* Update typo2

* [CI]: Update travis.yml

* [CI]: Update .travis.yml typo

* [Documentation]: Code Coverage Badge Update

* Fix typo

* [Test]: Image Cutting Methods test

ImageCutting Method
1. createContainerDirectory() tested
2. UIImage.saveTileOf(size:name:withExtension) tested

* [Test]: Update Unit Tests

1. ImageGenergateHelperTests
2. ImageManagerTests
3. THTiledImageContentViewTests

Set testing code
diff --git a/THTiledImageView.podspec b/THTiledImageView.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'THTiledImageView'
-  s.version          = '0.3'
+  s.version          = '0.3.1'
   s.summary          = 'High Quality Image ScrollView using cropped tiled images.'
 
   s.description      = <<-DESC
diff --git a/THTiledImageView.xcodeproj/project.pbxproj b/THTiledImageView.xcodeproj/project.pbxproj
@@ -14,6 +14,9 @@
 		7E0C4F9B1FF7357D00778CED /* THTileImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E0C4F9A1FF7357D00778CED /* THTileImageView.swift */; };
 		7E0C4F9D1FF73CAB00778CED /* THTiledImageContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E0C4F9C1FF73CAB00778CED /* THTiledImageContentView.swift */; };
 		7E0C4F9F1FF73F5100778CED /* MyTileImageViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E0C4F9E1FF73F5100778CED /* MyTileImageViewDataSource.swift */; };
+		7E0CF80D203EDD7C005B503C /* ImageGenergateHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E0CF80C203EDD7C005B503C /* ImageGenergateHelperTests.swift */; };
+		7E0CF80F203EEBD2005B503C /* ImageManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E0CF80E203EEBD2005B503C /* ImageManagerTest.swift */; };
+		7E0CF811203F01EE005B503C /* THTileImageContentViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E0CF810203F01EE005B503C /* THTileImageContentViewTests.swift */; };
 		7E10AFEC203179C000263B91 /* THTiledImageViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E10AFEB203179C000263B91 /* THTiledImageViewTests.swift */; };
 		7E116FB7203DB940003FC907 /* THTiledImageScrollViewTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E116FB6203DB940003FC907 /* THTiledImageScrollViewTests.swift */; };
 		7E95FEC6200361E200580A13 /* THTiledImageGenerateHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E95FEC5200361E200580A13 /* THTiledImageGenerateHelper.swift */; };
@@ -52,6 +55,9 @@
 		7E0C4F9A1FF7357D00778CED /* THTileImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = THTileImageView.swift; sourceTree = "<group>"; };
 		7E0C4F9C1FF73CAB00778CED /* THTiledImageContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = THTiledImageContentView.swift; sourceTree = "<group>"; };
 		7E0C4F9E1FF73F5100778CED /* MyTileImageViewDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyTileImageViewDataSource.swift; sourceTree = "<group>"; };
+		7E0CF80C203EDD7C005B503C /* ImageGenergateHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageGenergateHelperTests.swift; sourceTree = "<group>"; };
+		7E0CF80E203EEBD2005B503C /* ImageManagerTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageManagerTest.swift; sourceTree = "<group>"; };
+		7E0CF810203F01EE005B503C /* THTileImageContentViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = THTileImageContentViewTests.swift; sourceTree = "<group>"; };
 		7E10AFE9203179BF00263B91 /* THTiledImageViewTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = THTiledImageViewTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		7E10AFEB203179C000263B91 /* THTiledImageViewTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = THTiledImageViewTests.swift; sourceTree = "<group>"; };
 		7E10AFED203179C000263B91 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -126,6 +132,9 @@
 			children = (
 				7E10AFEB203179C000263B91 /* THTiledImageViewTests.swift */,
 				7E116FB6203DB940003FC907 /* THTiledImageScrollViewTests.swift */,
+				7E0CF80C203EDD7C005B503C /* ImageGenergateHelperTests.swift */,
+				7E0CF810203F01EE005B503C /* THTileImageContentViewTests.swift */,
+				7E0CF80E203EEBD2005B503C /* ImageManagerTest.swift */,
 				7E10AFED203179C000263B91 /* Info.plist */,
 			);
 			path = THTiledImageViewTests;
@@ -378,7 +387,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				7E116FB7203DB940003FC907 /* THTiledImageScrollViewTests.swift in Sources */,
+				7E0CF80D203EDD7C005B503C /* ImageGenergateHelperTests.swift in Sources */,
 				7E10AFEC203179C000263B91 /* THTiledImageViewTests.swift in Sources */,
+				7E0CF80F203EEBD2005B503C /* ImageManagerTest.swift in Sources */,
+				7E0CF811203F01EE005B503C /* THTileImageContentViewTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/THTiledImageView.xcodeproj/xcshareddata/xcschemes/THTiledImageViewTests.xcscheme b/THTiledImageView.xcodeproj/xcshareddata/xcschemes/THTiledImageViewTests.xcscheme
@@ -11,7 +11,12 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       language = ""
+<<<<<<< HEAD
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+=======
       shouldUseLaunchSchemeArgsEnv = "YES">
+>>>>>>> master
       <Testables>
          <TestableReference
             skipped = "NO">
diff --git a/THTiledImageView.xcworkspace/xcuserdata/changnam.xcuserdatad/UserInterfaceState.xcuserstate b/THTiledImageView.xcworkspace/xcuserdata/changnam.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/THTiledImageView/THTiledImageView/THImageManager.swift b/THTiledImageView/THTiledImageView/THImageManager.swift
@@ -9,7 +9,7 @@
 import Foundation
 import Kingfisher
 
-typealias THImageDownloaderCompletion = (UIImage, URL) -> Void
+typealias THImageDownloaderCompletion = (UIImage?, URL?, Error?) -> Void
 typealias THImageCacheCompletion = () -> Void
 
 class THImageDownloadManager {
@@ -18,13 +18,12 @@ class THImageDownloadManager {
     func downloadEachTiles(path url: URL, completion: @escaping THImageDownloaderCompletion) {
         ImageDownloader.default.downloadImage(with: url, retrieveImageTask: nil,
                                               options: [], progressBlock: nil) { (image, error, url, _) in
-                                                if let _ = error {
-                                                    // print(error)
-                                                    completion(UIImage(), url!)
-                                                    return
-                                                }
-                                                guard let image = image, let url = url else { return }
-                                                completion(image, url)
+                if let error = error {
+                    completion(nil, nil, error)
+                }
+
+                guard let image = image, let url = url else { return }
+                completion(image, url, nil)
         }
     }
 }
diff --git a/THTiledImageView/THTiledImageView/THTileImageView.swift b/THTiledImageView/THTiledImageView/THTileImageView.swift
@@ -143,11 +143,16 @@ class THTiledImageView: UIView {
         if requestDict[imageKey] == nil {
             requestDict.updateValue(true, forKey: imageKey)
 
-            THImageDownloadManager.default.downloadEachTiles(path: downloadPath) { image, _ in
-                THImageCacheManager.default.cacheTiles(image: image, imageIdentifier: imageKey) {
-                    let tile = THTile(tileImage: image, tileRect: tileRect)
-                    self.layer.setNeedsDisplay(tile.tileRect)
+            THImageDownloadManager.default.downloadEachTiles(path: downloadPath) { image, _, error in
+                if let error = error {
+                    print(error)
+                }
+                if let image = image {
+                    THImageCacheManager.default.cacheTiles(image: image, imageIdentifier: imageKey) {
+                        let tile = THTile(tileImage: image, tileRect: tileRect)
+                        self.layer.setNeedsDisplay(tile.tileRect)
 
+                    }
                 }
             }
         }
diff --git a/THTiledImageView/THTiledImageView/THTiledImageContentView.swift b/THTiledImageView/THTiledImageView/THTiledImageContentView.swift
@@ -14,8 +14,6 @@ class THTiledImageContentView: UIView {
     let tileImageView: THTiledImageView
     let backgroundImageView: UIImageView
 
-    var dataSource: THTiledImageViewDataSource?
-
     init(tileImageView: THTiledImageView, dataSource: THTiledImageViewDataSource) {
         self.tileImageView = tileImageView
         self.backgroundImageView = UIImageView(frame: tileImageView.bounds)
diff --git a/THTiledImageView/THTiledImageView/THTiledImageViewDataSource.swift b/THTiledImageView/THTiledImageView/THTiledImageViewDataSource.swift
@@ -73,7 +73,7 @@ extension THTiledImageViewDataSource {
             case 200:
                 if let data = data, let image = UIImage(data: data) {
                     self.backgroundImage = image
-                    completionHandler(self.backgroundImage)
+                    completionHandler(image)
                 }
             default:
                 completionHandler(nil)
diff --git a/THTiledImageView/ViewController.swift b/THTiledImageView/ViewController.swift
@@ -79,8 +79,6 @@ class ViewController: UIViewController {
                 }
             }
         }
-        
-        print(scrollViewSize)
         return scrollViewSize
     }
 }
diff --git a/THTiledImageViewTests/ImageGenergateHelperTests.swift b/THTiledImageViewTests/ImageGenergateHelperTests.swift
@@ -0,0 +1,76 @@
+//
+//  ImageGenergateHelperTests.swift
+//  THTiledImageViewTests
+//
+//  Created by 홍창남 on 2018. 2. 22..
+//  Copyright © 2018년 홍창남. All rights reserved.
+//
+
+import XCTest
+@testable import THTiledImageView
+
+class ImageGenergateHelperTests: XCTestCase {
+
+    var imageExist: Bool = false
+
+    let randomString = NSUUID().uuidString
+
+    override func tearDown() {
+        // remove created directory for testing
+        let cachesPath = NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true)[0] as String
+
+        let dirPath = "\(cachesPath)/\(randomString)"
+        let benchPath = "\(cachesPath)/bench"
+
+        do {
+            try FileManager.default.removeItem(atPath: dirPath)
+            try FileManager.default.removeItem(atPath: benchPath)
+        } catch let err {
+            print(err)
+        }
+
+        super.tearDown()
+    }
+
+    func testDirectoryExists() {
+        let cachesPath = NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true)[0] as String
+
+        let dirPath = "\(cachesPath)/\(randomString)"
+
+        FileManager.createContainerDirectory(path: dirPath)
+
+        var result = false
+        if let contents = try? FileManager.default.contentsOfDirectory(atPath: "\(cachesPath)") {
+            contents.forEach { dir in
+                if dir == "bench" {
+                    result = true
+                }
+            }
+        }
+        XCTAssert(result, "directory is not created.")
+    }
+
+    func testCuttingImages() {
+        let tiles: [CGSize] = [CGSize(width: 1024, height: 1024), CGSize(width: 512, height: 512)]
+
+        UIImage.saveTileOf(size: tiles, name: "bench", withExtension: "jpg") { _ in
+            let cachesPath = NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true)[0] as String
+
+            let path = "\(cachesPath)/bench/1024/" + "bench_1024_1_0_0.jpg"
+            if FileManager.default.fileExists(atPath: path) {
+                self.imageExist = true
+            }
+        }
+
+        let pred = NSPredicate(format: "imageExist == true")
+        let exp = expectation(for: pred, evaluatedWith: self, handler: nil)
+        let result = XCTWaiter.wait(for: [exp], timeout: 10.0)
+
+        if result == XCTWaiter.Result.completed {
+            XCTAssert(imageExist, "The call to get the url into another error")
+        } else {
+            XCTAssert(false, "The call to cut image into another error")
+        }
+
+    }
+}
diff --git a/THTiledImageViewTests/ImageManagerTest.swift b/THTiledImageViewTests/ImageManagerTest.swift
@@ -0,0 +1,68 @@
+//
+//  ImageManagerTest.swift
+//  THTiledImageViewTests
+//
+//  Created by 홍창남 on 2018. 2. 22..
+//  Copyright © 2018년 홍창남. All rights reserved.
+//
+
+import XCTest
+@testable import THTiledImageView
+
+class ImageManagerTest: XCTestCase {
+
+    var downloadImage1: UIImage?
+    var downloadImage2: UIImage?
+
+    func testDownloadMangerSuccess() {
+        let url = URL(string: "https://dl.dropbox.com/s/g1oomszqsnc5eue/smallBench.jpg")!
+
+        THImageDownloadManager.default.downloadEachTiles(path: url) { image, _, error in
+            if error == nil {
+                self.downloadImage1 = image
+            }
+        }
+
+        let pred = NSPredicate(format: "downloadImage1 != nil")
+        let exp = expectation(for: pred, evaluatedWith: self, handler: nil)
+        let result = XCTWaiter.wait(for: [exp], timeout: 5.0)
+
+        let messages = ["The call to download image has error", "The call to download image into another error"]
+
+        if result == XCTWaiter.Result.completed {
+            XCTAssertNotNil(downloadImage1, messages[0])
+        } else if result == XCTWaiter.Result.timedOut {
+            XCTAssert(false, "Request Time out")
+        } else {
+            XCTAssert(false, messages[1])
+        }
+    }
+
+    func testDownloadMangerError() {
+        let url = URL(string: "https://dl.dropboxusercontent.com/s/g1oo")!
+
+        THImageDownloadManager.default.downloadEachTiles(path: url) { _, _, error in
+            if error != nil {
+                self.downloadImage2 = nil
+            } else {
+                self.downloadImage2 = UIImage()
+            }
+        }
+
+        let pred = NSPredicate(format: "downloadImage2 != nil")
+        let exp = expectation(for: pred, evaluatedWith: self, handler: nil)
+        let result = XCTWaiter.wait(for: [exp], timeout: 5.0)
+
+        let messages = ["The call to download image has error", "The call to download image into another error"]
+
+        if result == XCTWaiter.Result.completed || result == XCTWaiter.Result.timedOut {
+            XCTAssertNil(downloadImage2, messages[0])
+        } else {
+            XCTAssert(false, messages[1])
+        }
+    }
+
+    func testCacheManger() {
+
+    }
+}
diff --git a/THTiledImageViewTests/THTileImageContentViewTests.swift b/THTiledImageViewTests/THTileImageContentViewTests.swift
@@ -0,0 +1,70 @@
+//
+//  THTileImageContentView.swift
+//  THTiledImageViewTests
+//
+//  Created by 홍창남 on 2018. 2. 22..
+//  Copyright © 2018년 홍창남. All rights reserved.
+//
+
+import XCTest
+@testable import THTiledImageView
+
+class THTileImageContentViewTests: XCTestCase {
+
+    var scrollView: THTiledImageScrollView!
+    var contentView: THTiledImageContentView?
+    var dataSource: MyTileImageViewDataSource?
+
+    var contentBackground: UIImage?
+
+    override func setUp() {
+        super.setUp()
+        scrollView = THTiledImageScrollView()
+
+    }
+
+//    func testContentViewBackgroundImage() {
+//        dataSource = MyTileImageViewDataSource(imageSize: CGSize(width: 5200, height: 4300), tileSize: [CGSize(width: 1024, height: 1024)])
+//        dataSource?.backgroundImageURL = URL(string: "https://dl.dropbox.com/s/g1oomszqsnc5eue/smallBench.jpg")
+//
+//        let tileImageView = THTiledImageView(dataSource: dataSource!)
+//        contentView = THTiledImageContentView(tileImageView: tileImageView, dataSource: dataSource!)
+//
+//        let pred = NSPredicate(format: "dataSource.backgroundImage != nil")
+//        let exp = expectation(for: pred, evaluatedWith: self, handler: nil)
+//        let result = XCTWaiter.wait(for: [exp], timeout: 5.0)
+//
+//        let messages = ["The call to request background image has error", "The call to request background image into another error"]
+//
+//        if result == XCTWaiter.Result.completed {
+//            XCTAssertNotNil(dataSource?.backgroundImage, messages[0])
+//        } else if result == XCTWaiter.Result.timedOut {
+//            XCTAssert(false, "Request Time out")
+//        } else {
+//            XCTAssert(false, messages[1])
+//        }
+//    }
+}
+
+//init(tileImageView: THTiledImageView, dataSource: THTiledImageViewDataSource) {
+//    self.tileImageView = tileImageView
+//    self.backgroundImageView = UIImageView(frame: tileImageView.bounds)
+//    super.init(frame: tileImageView.frame)
+//
+//    backgroundImageView.contentMode = .scaleAspectFit
+//
+//    if let backgroundImage = dataSource.backgroundImage {
+//        backgroundImageView.image = backgroundImage
+//    } else {
+//        dataSource.requestBackgroundImage { image in
+//            DispatchQueue.main.async {
+//                if let image = image {
+//                    self.backgroundImageView.image = image
+//                    self.backgroundImageView.setNeedsDisplay()
+//                }
+//            }
+//        }
+//    }
+//    self.addSubview(backgroundImageView)
+//    self.addSubview(tileImageView)
+//}
diff --git a/THTiledImageViewTests/THTiledImageScrollViewTests.swift b/THTiledImageViewTests/THTiledImageScrollViewTests.swift
diff --git a/THTiledImageViewTests/THTiledImageViewTests.swift b/THTiledImageViewTests/THTiledImageViewTests.swift

Original file line number	Diff line number	Diff line change
`@@ -143,11 +143,16 @@ class THTiledImageView: UIView {`
`143`	`143`	`if requestDict[imageKey] == nil {`
`144`	`144`	`requestDict.updateValue(true, forKey: imageKey)`
`145`	`145`
`146`		`- THImageDownloadManager.default.downloadEachTiles(path: downloadPath) { image, _ in`
`147`		`- THImageCacheManager.default.cacheTiles(image: image, imageIdentifier: imageKey) {`
`148`		`- let tile = THTile(tileImage: image, tileRect: tileRect)`
`149`		`- self.layer.setNeedsDisplay(tile.tileRect)`
	`146`	`+ THImageDownloadManager.default.downloadEachTiles(path: downloadPath) { image, _, error in`
	`147`	`+ if let error = error {`
	`148`	`+ print(error)`
	`149`	`+ }`
	`150`	`+ if let image = image {`
	`151`	`+ THImageCacheManager.default.cacheTiles(image: image, imageIdentifier: imageKey) {`
	`152`	`+ let tile = THTile(tileImage: image, tileRect: tileRect)`
	`153`	`+ self.layer.setNeedsDisplay(tile.tileRect)`
`150`	`154`
	`155`	`+ }`
`151`	`156`	`}`
`152`	`157`	`}`
`153`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ extension THTiledImageViewDataSource {`
`73`	`73`	`case 200:`
`74`	`74`	`if let data = data, let image = UIImage(data: data) {`
`75`	`75`	`self.backgroundImage = image`
`76`		`- completionHandler(self.backgroundImage)`
	`76`	`+ completionHandler(image)`
`77`	`77`	`}`
`78`	`78`	`default:`
`79`	`79`	`completionHandler(nil)`
Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,6 @@ class ViewController: UIViewController {`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`}`
`82`		`-`
`83`		`- print(scrollViewSize)`
`84`	`82`	`return scrollViewSize`
`85`	`83`	`}`
`86`	`84`	`}`