fixes #830, #880: bring back iOS tests; split OS X & iOS tests

.gitmodules

@@ -12,7 +12,7 @@
 
 [submodule "test/ios/KIF"]
 	path = test/ios/KIF
-	url = https://github.com/mapbox/KIF.git
+	url = https://github.com/kif-framework/KIF.git
 
 [submodule "platform/ios/vendor/SMCalloutView"]
 	path = platform/ios/vendor/SMCalloutView

.travis.yml

@@ -35,7 +35,10 @@ matrix:
       env: BUILDTYPE=Release JOBS=8
       compiler: gcc
     - os: osx
-      env: BUILDTYPE=Debug JOBS=8
+      env: BUILDTYPE=Debug JOBS=8 TEST_OS=osx
+      compiler: clang
+    - os: osx
+      env: BUILDTYPE=Release JOBS=8 TEST_OS=ios
       compiler: clang
 
 env:

Makefile

@@ -28,6 +28,9 @@ styles/styles:
 SMCalloutView:
 	git submodule update --init platform/ios/vendor/SMCalloutView
 
+KIF:
+	git submodule update --init test/ios/KIF
+
 #### Library builds ############################################################
 
 .PRECIOUS: Makefile/mbgl
@@ -124,6 +127,10 @@ ios: Xcode/ios
 isim: Xcode/ios
 	xcodebuild -sdk iphonesimulator ARCHS="x86_64 i386" -project ./build/ios/ios/app/mapboxgl-app.xcodeproj -configuration Debug -target iosapp -jobs $(JOBS)
 
+itest: Xcode/ios KIF
+	./scripts/package_ios.sh
+	./scripts/test_ios.sh
+
 # Legacy name
 iproj: ios-proj
 

README.md

@@ -48,7 +48,7 @@ Target OS X: 10.9+
 
 If you merely want to install the library for iOS and try it out as an Objective-C consumer:
 
-0. Use [Homebrew](http://brew.sh/) to install Boost headers: `brew install boost`.
+0. Use [Homebrew](http://brew.sh/) to install Boost headers & some utilities: `brew install boost xcpretty xctool`.
 1. Run `./scripts/package_ios.sh`. The packaging script will produce the statically-linked `libMapboxGL.a`, `MapboxGL.bundle` for resources, and a `Headers` folder.
 2. Copy the contents of `build/ios/pkg/static` into your project. It should happen automatically, but ensure that:
    - `Headers` is in your *Header Search Paths* (`HEADER_SEARCH_PATHS`) build setting.
@@ -70,6 +70,8 @@ If you merely want to install the library for iOS and try it out as an Objective
 
 If you want to build from source and/or contribute to development of the project, run `make iproj`, which will create and open an Xcode project which can build the entire library from source as well as an Objective-C test app.
 
+You can also run `make itest` to run the included tests.
+
 Target devices: iPhone 4S and above (5, 5c, 5s, 6, 6 Plus) and iPad 2 and above (3, 4, Mini, Air, Mini 2, Air 2).
 
 Target iOS: 7.0 through 8.1

scripts/package_ios.sh

@@ -33,9 +33,10 @@ export BUILDTYPE=${BUILDTYPE:-Release}
 export HOST=ios
 make Xcode/mbgl
 
-step "Building iOS targets..."
+step "Building iOS device targets..."
 xcodebuild -sdk iphoneos${IOS_SDK_VERSION} \
     ARCHS="arm64 armv7 armv7s" \
+    ONLY_ACTIVE_ARCH=NO \
     -project ./build/ios/mbgl.xcodeproj \
     -configuration ${BUILDTYPE} \
     -target everything \
@@ -45,6 +46,7 @@ xcodebuild -sdk iphoneos${IOS_SDK_VERSION} \
 step "Building iOS Simulator targets..."
 xcodebuild -sdk iphonesimulator${IOS_SDK_VERSION} \
     ARCHS="x86_64 i386" \
+    ONLY_ACTIVE_ARCH=NO \
     -project ./build/ios/mbgl.xcodeproj \
     -configuration ${BUILDTYPE} \
     -target everything \

scripts/test_ios.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+set -u
+
+xctool test \
+    -project ./test/ios/ios-tests.xcodeproj \
+    -scheme 'Mapbox GL Tests' \
+    -sdk iphonesimulator \
+    -destination 'platform=iOS Simulator,name=iPhone 5s,OS=7.1' \
+    -destination 'platform=iOS Simulator,name=iPhone 5s,OS=8.1' \
+    -destination 'platform=iOS Simulator,name=iPad 2,OS=7.1' \
+    -destination 'platform=iOS Simulator,name=iPad 2,OS=8.1'

scripts/travis_script.sh

@@ -34,18 +34,20 @@ elif [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
         mapbox_time_finish
     fi
 
-elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
+elif [[ ${TRAVIS_OS_NAME} == "osx" && ${TEST_OS} == "osx" ]]; then
     #
     # build OS X
     #
-    mapbox_time "build_osx_project" \
+    mapbox_time "build_osx" \
     make xosx -j$JOBS
 
+elif [[ ${TRAVIS_OS_NAME} == "osx" && ${TEST_OS} == "ios" ]]; then
     #
-    # build iOS
+    # test iOS
     #
-    mapbox_time "build_ios_project_device_release" \
-    make ios -j$JOBS
-    mapbox_time "build_ios_project_simulator_debug" \
-    make isim -j$JOBS
+    mapbox_time "checkout_kif" \
+    git submodule update --init test/ios/KIF
+
+    mapbox_time "run_ios_tests"
+    make itest
 fi

test/ios/KIFTestActor+MapboxGL.h

@@ -1,3 +1,4 @@
+#import <UIKit/UIKit.h>
 #import <KIF/KIF.h>
 
 @class MGLMapView;

test/ios/KIFTestActor+MapboxGL.m

@@ -1,7 +1,8 @@
 #import "KIFTestActor+MapboxGL.h"
+
+#import "MapboxGL.h"
+
 #import <KIF/UIApplication-KIFAdditions.h>
-#import <KIF/UIAccessibilityElement-KIFAdditions.h>
-#import "MGLMapView.h"
 
 @implementation KIFTestActor (MapboxGL)
 

test/ios/MGLTAppDelegate.h

@@ -2,6 +2,6 @@
 
 @interface MGLTAppDelegate : UIResponder <UIApplicationDelegate>
 
-@property (strong, nonatomic) UIWindow *window;
+@property (nonatomic) UIWindow *window;
 
 @end

test/ios/MGLTViewController.m

@@ -1,5 +1,5 @@
 #import "MGLTViewController.h"
-#import "MGLMapView.h"
+#import "MapboxGL.h"
 
 @implementation MGLTViewController
 

test/ios/MapViewTests.m

@@ -1,7 +1,10 @@
 #import "MapViewTests.h"
-#import <KIF/KIFTestStepValidation.h>
+
 #import "KIFTestActor+MapboxGL.h"
-#import "MGLMapView.h"
+
+#import "MapboxGL.h"
+
+#import <KIF/KIFTestStepValidation.h>
 
 @interface MapViewTests () <MGLMapViewDelegate>
 
@@ -91,17 +94,19 @@ - (void)testZoom {
                        distance:50
                           steps:10];
 
-    XCTAssertTrue(tester.mapView.zoomLevel > zoom,
-                  @"zoom gesture should increase zoom level");
+    XCTAssertGreaterThan(tester.mapView.zoomLevel,
+                         zoom,
+                         @"zoom gesture should increase zoom level");
 
     zoom = tester.mapView.zoomLevel;
     [tester.mapView pinchAtPoint:CGPointMake(tester.mapView.bounds.size.width / 2,
                                              tester.mapView.bounds.size.height / 2)
                         distance:50
                            steps:10];
 
-    XCTAssertTrue(tester.mapView.zoomLevel < zoom,
-                  @"pinch gesture should decrease zoom level");
+    XCTAssertLessThan(tester.mapView.zoomLevel,
+                      zoom,
+                      @"pinch gesture should decrease zoom level");
 }
 
 - (void)testZoomDisabled {
@@ -132,10 +137,12 @@ - (void)testPan {
 
     [tester.mapView dragFromPoint:CGPointMake(10, 10) toPoint:CGPointMake(300, 300) steps:10];
 
-    XCTAssertTrue(tester.mapView.centerCoordinate.latitude > centerCoordinate.latitude,
-                  @"panning map down should increase center latitude");
-    XCTAssertTrue(tester.mapView.centerCoordinate.longitude < centerCoordinate.longitude,
-                  @"panning map right should decrease center longitude");
+    XCTAssertGreaterThan(tester.mapView.centerCoordinate.latitude,
+                         centerCoordinate.latitude,
+                         @"panning map down should increase center latitude");
+    XCTAssertLessThan(tester.mapView.centerCoordinate.longitude,
+                      centerCoordinate.longitude,
+                      @"panning map right should decrease center longitude");
 }
 
 - (void)testPanDisabled {
@@ -144,12 +151,45 @@ - (void)testPanDisabled {
 
     [tester.mapView dragFromPoint:CGPointMake(10, 10) toPoint:CGPointMake(300, 300) steps:10];
 
-    __KIFAssertEqual(centerCoordinate.latitude,
-                     tester.mapView.centerCoordinate.latitude,
-                     @"disabling pan gesture should disallow vertical panning");
-    __KIFAssertEqual(centerCoordinate.longitude,
-                     tester.mapView.centerCoordinate.longitude,
-                     @"disabling pan gesture should disallow horizontal panning");
+    XCTAssertEqualWithAccuracy(centerCoordinate.latitude,
+                               tester.mapView.centerCoordinate.latitude,
+                               0.005,
+                               @"disabling pan gesture should disallow vertical panning");
+    XCTAssertEqualWithAccuracy(centerCoordinate.longitude,
+                               tester.mapView.centerCoordinate.longitude,
+                               0.005,
+                               @"disabling pan gesture should disallow horizontal panning");
+}
+
+- (void)testRotate {
+    CLLocationDirection startAngle = tester.mapView.direction;
+
+    XCTAssertNotEqual(startAngle,
+                      45,
+                      @"start angle must not be destination angle");
+
+    [tester.mapView twoFingerRotateAtPoint:tester.mapView.center angle:45];
+
+    XCTAssertGreaterThanOrEqual(fabs(tester.mapView.direction - startAngle),
+                                20,
+                                @"rotating map should change angle");
+}
+
+- (void)testRotateDisabled {
+    tester.mapView.rotateEnabled = NO;
+
+    CLLocationDirection startAngle = tester.mapView.direction;
+
+    XCTAssertNotEqual(startAngle,
+                      45,
+                      @"start angle must not be destination angle");
+
+    [tester.mapView twoFingerRotateAtPoint:tester.mapView.center angle:45];
+
+    XCTAssertEqualWithAccuracy(tester.mapView.direction,
+                               startAngle,
+                               0.005,
+                               @"disabling rotation show disallow rotation gestures");
 }
 
 - (void)testCenterSet {
@@ -161,12 +201,14 @@ - (void)testCenterSet {
                       newCenterCoordinate.longitude,
                       @"initial setup should have differing center longitude");
 
-    [tester.mapView setCenterCoordinate:newCenterCoordinate];
+    tester.mapView.centerCoordinate = newCenterCoordinate;
 
-    XCTAssertTrue(tester.mapView.centerCoordinate.latitude == newCenterCoordinate.latitude,
-                  @"setting center should change latitude");
-    XCTAssertTrue(tester.mapView.centerCoordinate.longitude == newCenterCoordinate.longitude,
-                  @"setting center should change longitude");
+    XCTAssertEqual(tester.mapView.centerCoordinate.latitude,
+                   newCenterCoordinate.latitude,
+                   @"setting center should change latitude");
+    XCTAssertEqual(tester.mapView.centerCoordinate.longitude,
+                   newCenterCoordinate.longitude,
+                   @"setting center should change longitude");
 }
 
 - (void)testZoomSet {
@@ -233,7 +275,7 @@ - (void)testBottomLayoutGuide {
     logoBugFrame = [logoBug.superview convertRect:logoBug.frame toView:nil];
     toolbarFrame = [tester.window convertRect:toolbar.frame toView:nil];
     XCTAssertFalse(CGRectIntersectsRect(logoBugFrame, toolbarFrame),
-                   @"rotated device should not have logo buy under toolbar");
+                   @"rotated device should not have logo bug under toolbar");
 
     attributionButtonFrame = [attributionButton.superview convertRect:attributionButton.frame toView:nil];
     XCTAssertFalse(CGRectIntersectsRect(attributionButtonFrame, toolbarFrame),