Fix tests for Xcode 8 GM

Author: mxcl

.travis.yml

@@ -2,13 +2,25 @@ language: objective-c
 osx_image: xcode8
 
 env:
-  - ACTION=test PLATFORM=Mac  DESTINATION='platform=OS X'
-  - ACTION=test PLATFORM=iOS  DESTINATION='platform=iOS Simulator,name=iPhone 6S' UUID='7FC06F6D-AF72-4B38-9A96-1F934EA2E27F'
-  - ACTION=test PLATFORM=tvOS DESTINATION='platform=tvOS Simulator,name=Apple TV 1080p' UUID='0DF1B136-A3A7-4C51-AE6E-CFEFDF52DA24'
-  
+  - PLATFORM=Mac
+  - PLATFORM=iOS NAME='iPhone SE'
+  - PLATFORM=tvOS NAME='Apple TV 1080p'
+
+before_install:
+  - if [ -n "$NAME" ]; then
+      export UUID=$(instruments -s | ruby -e "ARGF.each_line{ |ln| ln =~ /$NAME .* \[(.*)\]/; if \$1; puts(\$1); exit; end }");
+    fi
+
 install:
   - carthage bootstrap --platform $PLATFORM
 
 script:
-  - if [ -n "$UUID" ]; then xcrun instruments -w "$UUID" || true; sleep 15; fi
-  - set -o pipefail && xcodebuild -scheme PMKMapKit -destination "$DESTINATION" $ACTION | xcpretty
+  - set -o pipefail;
+    case $PLATFORM in
+    Mac)
+      xcodebuild -scheme PMKMapKit test | xcpretty;;
+    iOS|tvOS)
+      xcrun instruments -w "$UUID";
+      sleep 15;
+      xcodebuild -scheme PMKMapKit -destination "id=$UUID" test | xcpretty;;
+    esac

Tests/TestMapKit.swift

@@ -8,7 +8,7 @@ class Test_MKDirections_Swift: XCTestCase {
         let ex = expectation(description: "")
 
         class MockDirections: MKDirections {
-            private override func calculate(completionHandler: MKDirectionsHandler) {
+            private override func calculate(completionHandler: @escaping MKDirectionsHandler) {
                 completionHandler(MKDirectionsResponse(), nil)
             }
         }
@@ -28,7 +28,7 @@ class Test_MKDirections_Swift: XCTestCase {
         let ex = expectation(description: "")
 
         class MockDirections: MKDirections {
-            private override func calculateETA(completionHandler: MKETAHandler) {
+            private override func calculateETA(completionHandler: @escaping MKETAHandler) {
                 completionHandler(MKETAResponse(), nil)
             }
         }
@@ -48,7 +48,7 @@ class Test_MKSnapshotter_Swift: XCTestCase {
         let ex = expectation(description: "")
 
         class MockSnapshotter: MKMapSnapshotter {
-            private override func start(completionHandler: MKMapSnapshotCompletionHandler) {
+            private override func start(completionHandler: @escaping MKMapSnapshotCompletionHandler) {
                 completionHandler(MKMapSnapshot(), nil)
             }
         }