From 9a466ecd0b55789b24446ec1f897be213344e303 Mon Sep 17 00:00:00 2001 From: Julian Rex Date: Thu, 3 May 2018 20:34:56 -0400 Subject: Moved utility header into Darwin --- platform/darwin/test/MGLTestUtility.h | 27 +++++++++++++++++++++++++++ platform/ios/ios.xcodeproj/project.pbxproj | 4 ++-- platform/ios/test/MGLTestUtility.h | 27 --------------------------- 3 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 platform/darwin/test/MGLTestUtility.h delete mode 100644 platform/ios/test/MGLTestUtility.h diff --git a/platform/darwin/test/MGLTestUtility.h b/platform/darwin/test/MGLTestUtility.h new file mode 100644 index 0000000000..2e02e4f9de --- /dev/null +++ b/platform/darwin/test/MGLTestUtility.h @@ -0,0 +1,27 @@ + +/** + MGL_CHECK_IF_PENDING_TEST_SHOULD_RUN() + + Include this macro at the top of a "pending" test - one that would normally fail, + but you want to include is as a compile-time test or as a reminder. + + This will output the included warning in the test log, which `xcpretty` will detect. + This allows such pending tests to be identified in CI logs. + + If you provide `MAPBOX_RUN_PENDING_TESTS` as an environment variable ALL pending + tests will run. + + In addition, it's a good idea to append `PENDING` to the test method name, as this + will also be picked up by xcpretty. PENDING tests will be distinguished by a `⧖` + and `[PENDING]` + */ +#define MGL_CHECK_IF_PENDING_TEST_SHOULD_RUN() \ + /* By default, skip pending tests. Otherwise check environment for MAPBOX_RUN_PENDING_TESTS */ \ + { \ + NSString *runPendingTests = [[NSProcessInfo processInfo] environment][@"MAPBOX_RUN_PENDING_TESTS"]; \ + if (![runPendingTests boolValue]) { \ + /* The following warning will be picked up by xcpretty */ \ + printf("warning: '%s' is a pending test - skipping\n", __PRETTY_FUNCTION__); \ + return; \ + } \ + } diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 68ba1ca6ae..214eb5a776 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -998,9 +998,9 @@ AC518DFE201BB55A00EBC820 /* MGLTelemetryConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLTelemetryConfig.m; sourceTree = ""; }; CA0C27932076CA19001CE5B7 /* MGLMapViewIntegrationTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLMapViewIntegrationTest.m; sourceTree = ""; }; CA0C27952076CA50001CE5B7 /* MGLMapViewIntegrationTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLMapViewIntegrationTest.h; sourceTree = ""; }; - CA3B1629209801A5005C087B /* MGLTestUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MGLTestUtility.h; sourceTree = ""; }; CA4EB8C620863487006AB465 /* MGLStyleLayerIntegrationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MGLStyleLayerIntegrationTests.m; sourceTree = ""; }; CA55CD3E202C16AA00CE7095 /* MGLCameraChangeReason.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLCameraChangeReason.h; sourceTree = ""; }; + CA5E5042209BDC5F001A8A81 /* MGLTestUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MGLTestUtility.h; path = ../../darwin/test/MGLTestUtility.h; sourceTree = ""; }; DA00FC8C1D5EEB0D009AABC8 /* MGLAttributionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAttributionInfo.h; sourceTree = ""; }; DA00FC8D1D5EEB0D009AABC8 /* MGLAttributionInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLAttributionInfo.mm; sourceTree = ""; }; DA0CD58F1CF56F6A00A5F5A5 /* MGLFeatureTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLFeatureTests.mm; path = ../../darwin/test/MGLFeatureTests.mm; sourceTree = ""; }; @@ -1530,8 +1530,8 @@ 4031ACFD1E9FD26900A3EA26 /* Test Helpers */ = { isa = PBXGroup; children = ( + CA5E5042209BDC5F001A8A81 /* MGLTestUtility.h */, 4031ACFE1E9FD29F00A3EA26 /* MGLSDKTestHelpers.swift */, - CA3B1629209801A5005C087B /* MGLTestUtility.h */, ); name = "Test Helpers"; sourceTree = ""; diff --git a/platform/ios/test/MGLTestUtility.h b/platform/ios/test/MGLTestUtility.h deleted file mode 100644 index 2e02e4f9de..0000000000 --- a/platform/ios/test/MGLTestUtility.h +++ /dev/null @@ -1,27 +0,0 @@ - -/** - MGL_CHECK_IF_PENDING_TEST_SHOULD_RUN() - - Include this macro at the top of a "pending" test - one that would normally fail, - but you want to include is as a compile-time test or as a reminder. - - This will output the included warning in the test log, which `xcpretty` will detect. - This allows such pending tests to be identified in CI logs. - - If you provide `MAPBOX_RUN_PENDING_TESTS` as an environment variable ALL pending - tests will run. - - In addition, it's a good idea to append `PENDING` to the test method name, as this - will also be picked up by xcpretty. PENDING tests will be distinguished by a `⧖` - and `[PENDING]` - */ -#define MGL_CHECK_IF_PENDING_TEST_SHOULD_RUN() \ - /* By default, skip pending tests. Otherwise check environment for MAPBOX_RUN_PENDING_TESTS */ \ - { \ - NSString *runPendingTests = [[NSProcessInfo processInfo] environment][@"MAPBOX_RUN_PENDING_TESTS"]; \ - if (![runPendingTests boolValue]) { \ - /* The following warning will be picked up by xcpretty */ \ - printf("warning: '%s' is a pending test - skipping\n", __PRETTY_FUNCTION__); \ - return; \ - } \ - } -- cgit v1.2.1