Fixing setEventHandler func in Scheduler struct

FabrizioBrancati · May 25, 2020 · 2538480 · 2538480
1 parent f0ce788
commit 2538480
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Sources/Queuer/Scheduler.swift b/Sources/Queuer/Scheduler.swift
@@ -56,9 +56,7 @@ public struct Scheduler {
         timer = DispatchSource.makeTimerSource()
         timer.schedule(deadline: deadline, repeating: repeating)
         if let handler = handler {
-            timer.setEventHandler(qos: qualityOfService) {
-                handler()
-            }
+            timer.setEventHandler(qos: qualityOfService, handler: handler)
             timer.resume()
         }
     }
@@ -69,9 +67,7 @@ public struct Scheduler {
     public mutating func setHandler(_ handler: @escaping () -> Void) {
         self.handler = handler
 
-        timer.setEventHandler(qos: qualityOfService) {
-            handler()
-        }
+        timer.setEventHandler(qos: qualityOfService, handler: handler)
         timer.resume()
     }
 }
diff --git a/Tests/QueuerTests/SchedulerTests.swift b/Tests/QueuerTests/SchedulerTests.swift
@@ -45,6 +45,7 @@ internal class SchedulerTests: XCTestCase {
         waitForExpectations(timeout: 5) { error in
             XCTAssertNil(error)
             XCTAssertEqual(order, [0, 0, 0, 0])
+            schedule.timer.cancel()
         }
     }