aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmkiley <jordan.kiley@mapbox.com>2019-05-31 14:16:53 -0700
committerjmkiley <jordan.kiley@mapbox.com>2019-06-03 11:21:00 -0700
commit58ce1eca7920865ed04134ead9924a0c2e13c895 (patch)
treead15a0c665ac4556d707b50057f17f47d68b9d9e
parent892be4b6aee9943011db387b7e79a9e0adc511d5 (diff)
[ios] Cleaned up tests
-rw-r--r--platform/ios/Integration Tests/MBXTestMapView.m6
-rw-r--r--platform/ios/Integration Tests/MGLMapViewIntegrationTest.m2
-rw-r--r--platform/ios/Integration Tests/MGLTabBarControllerTests.m1
-rw-r--r--platform/ios/ios.xcodeproj/project.pbxproj20
-rw-r--r--platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme9
5 files changed, 1 insertions, 37 deletions
diff --git a/platform/ios/Integration Tests/MBXTestMapView.m b/platform/ios/Integration Tests/MBXTestMapView.m
index a8a61f830..d5f2adc63 100644
--- a/platform/ios/Integration Tests/MBXTestMapView.m
+++ b/platform/ios/Integration Tests/MBXTestMapView.m
@@ -11,10 +11,4 @@
[super updateFromDisplayLink:displayLink];
}
-- (void)didMoveToWindow {
- [super didMoveToWindow];
- NSLog(@"MOVING TO WINDOW");
-}
-
-
@end
diff --git a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m
index 0968d9898..fb3f8e25e 100644
--- a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m
+++ b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m
@@ -32,7 +32,7 @@
- (void)setUp {
[super setUp];
-// [MGLAccountManager setAccessToken:@"pk.feedcafedeadbeefbadebede"];
+ [MGLAccountManager setAccessToken:@"pk.feedcafedeadbeefbadebede"];
NSURL *styleURL = [[NSBundle bundleForClass:[self class]] URLForResource:@"one-liner" withExtension:@"json"];
self.mapView = [[MBXTestMapView alloc] initWithFrame:UIScreen.mainScreen.bounds styleURL:styleURL];
diff --git a/platform/ios/Integration Tests/MGLTabBarControllerTests.m b/platform/ios/Integration Tests/MGLTabBarControllerTests.m
index 4b6180d09..ca4718c3e 100644
--- a/platform/ios/Integration Tests/MGLTabBarControllerTests.m
+++ b/platform/ios/Integration Tests/MGLTabBarControllerTests.m
@@ -43,7 +43,6 @@
[expectation fulfill];
}];
- // Need to check
[self measureBlock:^{
[self.mapView updateFromDisplayLink:nil];
}];
diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj
index 03224040f..6fc2e87b0 100644
--- a/platform/ios/ios.xcodeproj/project.pbxproj
+++ b/platform/ios/ios.xcodeproj/project.pbxproj
@@ -2715,7 +2715,6 @@
DA1DC9471CB6C1C2006E619F /* Frameworks */,
DA1DC9481CB6C1C2006E619F /* Resources */,
DA4A269A1CB6F5D3000B7809 /* Embed Frameworks */,
- 074A7F0B2277BD67001A62D1 /* Insert Mapbox Access Token */,
);
buildRules = (
);
@@ -3009,25 +3008,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
- 074A7F0B2277BD67001A62D1 /* Insert Mapbox Access Token */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputFileListPaths = (
- );
- inputPaths = (
- "$(TARGET_BUILD_DIR)/$(INFOPLIST_PATH)",
- );
- name = "Insert Mapbox Access Token";
- outputFileListPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "$SRCROOT/app/insert_access_token.sh\n";
- };
07796BA2227908CB0059CAF1 /* Insert Mapbox Access Token */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
diff --git a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme
index dd0cdfe21..ce264aa19 100644
--- a/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme
+++ b/platform/ios/ios.xcodeproj/xcshareddata/xcschemes/Integration Test Harness.xcscheme
@@ -27,15 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "NO">
- <PreActions>
- <ExecutionAction
- ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
- <ActionContent
- title = "Run Script"
- scriptText = "$SRCROOT/app/insert_access_token.sh&#10;">
- </ActionContent>
- </ExecutionAction>
- </PreActions>
<Testables>
<TestableReference
skipped = "NO">