Sfoglia il codice sorgente

Remove unnecessary DispatchGroup from tests

Dominique Stranz 6 anni fa
parent
commit
7f6b0277e0
1 ha cambiato i file con 2 aggiunte e 20 eliminazioni
  1. 2 20
      Tests/KingfisherTests/ImageViewExtensionTests.swift

+ 2 - 20
Tests/KingfisherTests/ImageViewExtensionTests.swift

@@ -660,35 +660,26 @@ class ImageViewExtensionTests: XCTestCase {
         
         
         let options: KingfisherOptionsInfo = [.cacheMemoryOnly, .memoryCacheExpiration(.seconds(0.15))]
         let options: KingfisherOptionsInfo = [.cacheMemoryOnly, .memoryCacheExpiration(.seconds(0.15))]
         
         
-        let group = DispatchGroup()
-        
-        group.enter()
         imageView.kf.setImage(with: url, options: options) { result in
         imageView.kf.setImage(with: url, options: options) { result in
             XCTAssertNotNil(result.value?.image)
             XCTAssertNotNil(result.value?.image)
             XCTAssertTrue(result.value!.cacheType == .none)
             XCTAssertTrue(result.value!.cacheType == .none)
-            group.leave()
         }
         }
         
         
-        group.enter()
         delay(0.1) {
         delay(0.1) {
             self.imageView.kf.setImage(with: url, options: options) { result in
             self.imageView.kf.setImage(with: url, options: options) { result in
                 XCTAssertNotNil(result.value?.image)
                 XCTAssertNotNil(result.value?.image)
                 XCTAssertTrue(result.value!.cacheType == .memory)
                 XCTAssertTrue(result.value!.cacheType == .memory)
-                group.leave()
             }
             }
         }
         }
         
         
-        group.enter()
         delay(0.2) {
         delay(0.2) {
             self.imageView.kf.setImage(with: url, options: options) { result in
             self.imageView.kf.setImage(with: url, options: options) { result in
                 XCTAssertNotNil(result.value?.image)
                 XCTAssertNotNil(result.value?.image)
                 XCTAssertTrue(result.value!.cacheType == .memory)
                 XCTAssertTrue(result.value!.cacheType == .memory)
-                group.leave()
+                exp.fulfill()
             }
             }
         }
         }
         
         
-        group.notify(queue: .main, execute: exp.fulfill)
-        
         waitForExpectations(timeout: 3, handler: nil)
         waitForExpectations(timeout: 3, handler: nil)
     }
     }
     
     
@@ -699,35 +690,26 @@ class ImageViewExtensionTests: XCTestCase {
         
         
         let options: KingfisherOptionsInfo = [.cacheMemoryOnly, .memoryCacheExpirationNotExtendable, .memoryCacheExpiration(.seconds(0.15))]
         let options: KingfisherOptionsInfo = [.cacheMemoryOnly, .memoryCacheExpirationNotExtendable, .memoryCacheExpiration(.seconds(0.15))]
   
   
-        let group = DispatchGroup()
-        
-        group.enter()
         imageView.kf.setImage(with: url, options: options) { result in
         imageView.kf.setImage(with: url, options: options) { result in
             XCTAssertNotNil(result.value?.image)
             XCTAssertNotNil(result.value?.image)
             XCTAssertTrue(result.value!.cacheType == .none)
             XCTAssertTrue(result.value!.cacheType == .none)
-            group.leave()
         }
         }
         
         
-        group.enter()
         delay(0.1) {
         delay(0.1) {
             self.imageView.kf.setImage(with: url, options: options) { result in
             self.imageView.kf.setImage(with: url, options: options) { result in
                 XCTAssertNotNil(result.value?.image)
                 XCTAssertNotNil(result.value?.image)
                 XCTAssertTrue(result.value!.cacheType == .memory)
                 XCTAssertTrue(result.value!.cacheType == .memory)
-                group.leave()
             }
             }
         }
         }
         
         
-        group.enter()
         delay(0.2) {
         delay(0.2) {
             self.imageView.kf.setImage(with: url, options: options) { result in
             self.imageView.kf.setImage(with: url, options: options) { result in
                 XCTAssertNotNil(result.value?.image)
                 XCTAssertNotNil(result.value?.image)
                 XCTAssertTrue(result.value!.cacheType == .none)
                 XCTAssertTrue(result.value!.cacheType == .none)
-                group.leave()
+                exp.fulfill()
             }
             }
         }
         }
         
         
-        group.notify(queue: .main, execute: exp.fulfill)
-        
         waitForExpectations(timeout: 3, handler: nil)
         waitForExpectations(timeout: 3, handler: nil)
     }
     }
 }
 }