From 6d815401b10aaf7facba5f0676931a9908c1ba5b Mon Sep 17 00:00:00 2001 From: Juha Alanen Date: Thu, 13 Feb 2020 14:12:44 +0200 Subject: [test-runner] Share common code between iOS test runners --- platform/ios/ios.cmake | 82 +++++------- platform/ios/test/common/AppDelegate.h | 7 + platform/ios/test/common/AppDelegate.m | 38 ++++++ platform/ios/test/common/LaunchScreen.storyboard | 27 ++++ platform/ios/test/common/Main.storyboard | 27 ++++ platform/ios/test/common/Tests.m | 37 ++++++ platform/ios/test/common/ViewController.h | 6 + platform/ios/test/common/ViewController.m | 22 ++++ platform/ios/test/common/ios_test_runner.hpp | 14 ++ platform/ios/test/common/main.m | 9 ++ render-test/ios/AppDelegate.h | 7 - render-test/ios/AppDelegate.m | 38 ------ render-test/ios/Gemfile | 3 - render-test/ios/Gemfile.lock | 159 ----------------------- render-test/ios/LaunchScreen.storyboard | 27 ---- render-test/ios/Main.storyboard | 27 ---- render-test/ios/ViewController.h | 6 - render-test/ios/ViewController.m | 22 ---- render-test/ios/ios_test_runner.hpp | 14 -- test/ios/AppDelegate.h | 7 - test/ios/AppDelegate.m | 38 ------ test/ios/Gemfile | 3 - test/ios/LaunchScreen.storyboard | 27 ---- test/ios/Main.storyboard | 27 ---- test/ios/ViewController.h | 6 - test/ios/ViewController.m | 22 ---- test/ios/iosTestRunner.mm | 2 +- test/ios/ios_test_runner.cpp | 2 +- test/ios/ios_test_runner.hpp | 14 -- test/ios/main.m | 9 -- test/ios/tests/Tests.m | 37 ------ 31 files changed, 222 insertions(+), 544 deletions(-) create mode 100644 platform/ios/test/common/AppDelegate.h create mode 100644 platform/ios/test/common/AppDelegate.m create mode 100644 platform/ios/test/common/LaunchScreen.storyboard create mode 100644 platform/ios/test/common/Main.storyboard create mode 100644 platform/ios/test/common/Tests.m create mode 100644 platform/ios/test/common/ViewController.h create mode 100644 platform/ios/test/common/ViewController.m create mode 100644 platform/ios/test/common/ios_test_runner.hpp create mode 100644 platform/ios/test/common/main.m delete mode 100644 render-test/ios/AppDelegate.h delete mode 100644 render-test/ios/AppDelegate.m delete mode 100644 render-test/ios/Gemfile delete mode 100644 render-test/ios/Gemfile.lock delete mode 100644 render-test/ios/LaunchScreen.storyboard delete mode 100644 render-test/ios/Main.storyboard delete mode 100644 render-test/ios/ViewController.h delete mode 100644 render-test/ios/ViewController.m delete mode 100644 render-test/ios/ios_test_runner.hpp delete mode 100644 test/ios/AppDelegate.h delete mode 100644 test/ios/AppDelegate.m delete mode 100644 test/ios/Gemfile delete mode 100644 test/ios/LaunchScreen.storyboard delete mode 100644 test/ios/Main.storyboard delete mode 100644 test/ios/ViewController.h delete mode 100644 test/ios/ViewController.m delete mode 100644 test/ios/ios_test_runner.hpp delete mode 100644 test/ios/main.m delete mode 100644 test/ios/tests/Tests.m diff --git a/platform/ios/ios.cmake b/platform/ios/ios.cmake index 85b22afcc0..16d0ed41c2 100644 --- a/platform/ios/ios.cmake +++ b/platform/ios/ios.cmake @@ -94,30 +94,26 @@ target_link_libraries( ) if(MBGL_IOS_RENDER_TEST) - set(CMAKE_OSX_ARCHITECTURES "armv7;i386;x86_64;arm64") - include(${PROJECT_SOURCE_DIR}/vendor/zip-archive.cmake) initialize_ios_target(mbgl-vendor-zip-archive) set(PREPARE_CMD "${PROJECT_SOURCE_DIR}/render-test/ios/setup_test_data.sh") - message("COMMAND: ${PREPARE_CMD}") execute_process(COMMAND ${PREPARE_CMD} RESULT_VARIABLE CMD_ERROR WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) - message(STATUS "CMD_ERROR:" ${CMD_ERROR}) - set(RESOURCES ${PROJECT_SOURCE_DIR}/render-test/ios/Main.storyboard ${PROJECT_SOURCE_DIR}/render-test/ios/LaunchScreen.storyboard - ${PROJECT_SOURCE_DIR}/test-data) + set(RESOURCES ${PROJECT_SOURCE_DIR}/platform/ios/test/common/Main.storyboard + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/LaunchScreen.storyboard ${PROJECT_SOURCE_DIR}/test-data) add_executable( RenderTestApp - ${PROJECT_SOURCE_DIR}/render-test/ios/ios_test_runner.hpp + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/ios_test_runner.hpp + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/AppDelegate.h + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/AppDelegate.m + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/ViewController.h + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/ViewController.m + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/main.m ${PROJECT_SOURCE_DIR}/render-test/ios/ios_test_runner.cpp - ${PROJECT_SOURCE_DIR}/render-test/ios/AppDelegate.h - ${PROJECT_SOURCE_DIR}/render-test/ios/AppDelegate.m - ${PROJECT_SOURCE_DIR}/render-test/ios/ViewController.h - ${PROJECT_SOURCE_DIR}/render-test/ios/ViewController.m ${PROJECT_SOURCE_DIR}/render-test/ios/iosTestRunner.h ${PROJECT_SOURCE_DIR}/render-test/ios/iosTestRunner.mm - ${PROJECT_SOURCE_DIR}/render-test/ios/main.m ${RESOURCES} ) initialize_ios_target(RenderTestApp) @@ -147,6 +143,7 @@ if(MBGL_IOS_RENDER_TEST) ${PROJECT_SOURCE_DIR}/platform/darwin/include ${PROJECT_SOURCE_DIR}/platform/darwin/include/mbgl/interface/ ${PROJECT_SOURCE_DIR}/platform/default/include + ${PROJECT_SOURCE_DIR}/platform/ios/test/common ${PROJECT_SOURCE_DIR}/src ) @@ -168,19 +165,13 @@ if(MBGL_IOS_RENDER_TEST) mbgl-vendor-zip-archive ) + set_target_properties(RenderTestApp PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "") + set_target_properties(RenderTestApp PROPERTIES XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") + find_package(XCTest REQUIRED) xctest_add_bundle(RenderTestAppTests RenderTestApp ${PROJECT_SOURCE_DIR}/render-test/ios/tests/Tests.m) - set_target_properties( - RenderTestAppTests - PROPERTIES - XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET - "${IOS_DEPLOYMENT_TARGET}" - XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH - $<$:YES> - ) - target_include_directories( RenderTestAppTests PUBLIC ${PROJECT_SOURCE_DIR}/render-test/ios @@ -188,7 +179,11 @@ if(MBGL_IOS_RENDER_TEST) xctest_add_test(XCTest.RenderTestApp RenderTestAppTests) + set_target_properties(RenderTestAppTests PROPERTIES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IOS_DEPLOYMENT_TARGET}") + set_target_properties(RenderTestAppTests PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH $<$:YES>) set_target_properties(RenderTestAppTests PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/render-test/ios/tests/Info.plist) + set_target_properties(RenderTestAppTests PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "") + set_target_properties(RenderTestAppTests PROPERTIES XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") endif() if(MBGL_IOS_UNIT_TEST) @@ -199,24 +194,20 @@ if(MBGL_IOS_UNIT_TEST) ${CMAKE_CURRENT_BINARY_DIR}/test-data/mapbox-gl-js/src/style-spec/reference ) - set( - RESOURCES - ${PROJECT_SOURCE_DIR}/test/ios/Main.storyboard - ${PROJECT_SOURCE_DIR}/test/ios/LaunchScreen.storyboard - ${CMAKE_CURRENT_BINARY_DIR}/test-data - ) + set(RESOURCES ${PROJECT_SOURCE_DIR}/platform/ios/test/common/Main.storyboard + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/LaunchScreen.storyboard ${CMAKE_CURRENT_BINARY_DIR}/test-data) add_executable( UnitTestsApp - ${PROJECT_SOURCE_DIR}/test/ios/ios_test_runner.hpp + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/ios_test_runner.hpp + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/AppDelegate.h + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/AppDelegate.m + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/ViewController.h + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/ViewController.m + ${PROJECT_SOURCE_DIR}/platform/ios/test/common/main.m ${PROJECT_SOURCE_DIR}/test/ios/ios_test_runner.cpp - ${PROJECT_SOURCE_DIR}/test/ios/AppDelegate.h - ${PROJECT_SOURCE_DIR}/test/ios/AppDelegate.m - ${PROJECT_SOURCE_DIR}/test/ios/ViewController.h - ${PROJECT_SOURCE_DIR}/test/ios/ViewController.m ${PROJECT_SOURCE_DIR}/test/ios/iosTestRunner.h ${PROJECT_SOURCE_DIR}/test/ios/iosTestRunner.mm - ${PROJECT_SOURCE_DIR}/test/ios/main.m ${RESOURCES} ) initialize_ios_target(UnitTestsApp) @@ -236,12 +227,11 @@ if(MBGL_IOS_UNIT_TEST) target_include_directories( UnitTestsApp - PUBLIC {MBGL_ROOT}/test/include ${PROJECT_SOURCE_DIR}/include - ) - - target_include_directories( - UnitTestsApp - PUBLIC ${PROJECT_SOURCE_DIR}/test/ios + PUBLIC + ${PROJECT_SOURCE_DIR}/include + ${PROJECT_SOURCE_DIR}/platform/ios/test/common + ${PROJECT_SOURCE_DIR}/test/include + ${PROJECT_SOURCE_DIR}/test/ios ) target_link_libraries( @@ -263,16 +253,7 @@ if(MBGL_IOS_UNIT_TEST) find_package(XCTest REQUIRED) - xctest_add_bundle(UnitTestsAppTests UnitTestsApp ${PROJECT_SOURCE_DIR}/test/ios/tests/Tests.m) - - set_target_properties( - UnitTestsAppTests - PROPERTIES - XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET - "${IOS_DEPLOYMENT_TARGET}" - XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH - $<$:YES> - ) + xctest_add_bundle(UnitTestsAppTests UnitTestsApp ${PROJECT_SOURCE_DIR}/platform/ios/test/common/Tests.m) target_include_directories( UnitTestsAppTests @@ -281,8 +262,11 @@ if(MBGL_IOS_UNIT_TEST) xctest_add_test(XCTest.UnitTestsApp UnitTestsAppTests) + set_target_properties(UnitTestsAppTests PROPERTIES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IOS_DEPLOYMENT_TARGET}") + set_target_properties(UnitTestsAppTests PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH $<$:YES>) set_target_properties(UnitTestsAppTests PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/test/ios/tests/Info.plist) set_target_properties(UnitTestsAppTests PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "") set_target_properties(UnitTestsAppTests PROPERTIES XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO") endif() + unset(IOS_DEPLOYMENT_TARGET CACHE) diff --git a/platform/ios/test/common/AppDelegate.h b/platform/ios/test/common/AppDelegate.h new file mode 100644 index 0000000000..134c8063dc --- /dev/null +++ b/platform/ios/test/common/AppDelegate.h @@ -0,0 +1,7 @@ +#import // UIApplicationDelegate + +@interface AppDelegate : UIResponder + +@property (strong, nonatomic) UIWindow *window; + +@end \ No newline at end of file diff --git a/platform/ios/test/common/AppDelegate.m b/platform/ios/test/common/AppDelegate.m new file mode 100644 index 0000000000..874d18de2a --- /dev/null +++ b/platform/ios/test/common/AppDelegate.m @@ -0,0 +1,38 @@ +#import "AppDelegate.h" + +@interface AppDelegate() + +@end + +@implementation AppDelegate + +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + // Insert code here to initialize your application + NSLog(@"didFinishLaunchingWithOptions"); + return YES; +} + +- (void)applicationWillResignActive:(UIApplication *)application { + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. +} + +- (void)applicationDidEnterBackground:(UIApplication *)application { + // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. +} + +- (void)applicationWillEnterForeground:(UIApplication *)application { + // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. +} + +- (void)applicationDidBecomeActive:(UIApplication *)application { + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. +} + +- (void)applicationWillTerminate:(UIApplication *)application { + // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. +} + + +@end diff --git a/platform/ios/test/common/LaunchScreen.storyboard b/platform/ios/test/common/LaunchScreen.storyboard new file mode 100644 index 0000000000..c9b7564332 --- /dev/null +++ b/platform/ios/test/common/LaunchScreen.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/ios/test/common/Main.storyboard b/platform/ios/test/common/Main.storyboard new file mode 100644 index 0000000000..34d4c7e2ec --- /dev/null +++ b/platform/ios/test/common/Main.storyboard @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/ios/test/common/Tests.m b/platform/ios/test/common/Tests.m new file mode 100644 index 0000000000..8d0719705a --- /dev/null +++ b/platform/ios/test/common/Tests.m @@ -0,0 +1,37 @@ +#import +#import "iosTestRunner.h" +@interface Tests : XCTestCase + +@end + +@implementation Tests + +- (void)setUp { + [super setUp]; +} + +- (void)tearDown { + [super tearDown]; +} + +- (void)testStartTestRunner { + IosTestRunner* runner = [[IosTestRunner alloc] init]; + XCTAssert(runner, @"IOSTestRunner is not initialized correctly"); + + NSString* testResult = [runner getResultPath]; + XCTAssert(testResult, @"IOSTestRunner did not produce a test result file"); + + NSFileManager *fileManager = [NSFileManager defaultManager]; + BOOL fileFound = [fileManager fileExistsAtPath: testResult]; + XCTAssert(fileFound, @"Test result file '%@' does not exit", testResult); + NSURL *resultURL = [NSURL fileURLWithPath:testResult]; + XCTAttachment *attachment1URL = [XCTAttachment attachmentWithContentsOfFileAtURL: resultURL]; + XCTAssert(attachment1URL, @"Failed to attach test result '%@'", testResult); + attachment1URL.lifetime = XCTAttachmentLifetimeKeepAlways; + [self addAttachment:attachment1URL]; + + BOOL success = [runner getTestStatus]; + XCTAssert(success, @"IOSTestRunner reports error because some of the tests are not passed, please check the test report"); +} + +@end diff --git a/platform/ios/test/common/ViewController.h b/platform/ios/test/common/ViewController.h new file mode 100644 index 0000000000..9c7dfc57ec --- /dev/null +++ b/platform/ios/test/common/ViewController.h @@ -0,0 +1,6 @@ +#import + +@interface ViewController : UIViewController + +@end + diff --git a/platform/ios/test/common/ViewController.m b/platform/ios/test/common/ViewController.m new file mode 100644 index 0000000000..e9c526122a --- /dev/null +++ b/platform/ios/test/common/ViewController.m @@ -0,0 +1,22 @@ +#import "ViewController.h" +#import "iosTestRunner.h" + +@interface ViewController () +{ + IosTestRunner* i; +} +@end + +@implementation ViewController + +- (void)viewDidLoad { + [super viewDidLoad]; +// In order to run test runner with app itself instead of with unit test, comment out the following line. +// i = [[IosTestRunner alloc]init]; +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; +} + +@end diff --git a/platform/ios/test/common/ios_test_runner.hpp b/platform/ios/test/common/ios_test_runner.hpp new file mode 100644 index 0000000000..db263dc73c --- /dev/null +++ b/platform/ios/test/common/ios_test_runner.hpp @@ -0,0 +1,14 @@ +#ifndef ios_test_runner_hpp +#define ios_test_runner_hpp + +#include + +class TestRunner { +public: + TestRunner() = default; + ~TestRunner() = default; + + bool startTest(const std::string& path); +}; + +#endif /* ios_test_runner_hpp */ diff --git a/platform/ios/test/common/main.m b/platform/ios/test/common/main.m new file mode 100644 index 0000000000..f813c8fea9 --- /dev/null +++ b/platform/ios/test/common/main.m @@ -0,0 +1,9 @@ +#import +#import "AppDelegate.h" + +int main(int argc, char * argv[]) +{ + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + } +} diff --git a/render-test/ios/AppDelegate.h b/render-test/ios/AppDelegate.h deleted file mode 100644 index 134c8063dc..0000000000 --- a/render-test/ios/AppDelegate.h +++ /dev/null @@ -1,7 +0,0 @@ -#import // UIApplicationDelegate - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - -@end \ No newline at end of file diff --git a/render-test/ios/AppDelegate.m b/render-test/ios/AppDelegate.m deleted file mode 100644 index 874d18de2a..0000000000 --- a/render-test/ios/AppDelegate.m +++ /dev/null @@ -1,38 +0,0 @@ -#import "AppDelegate.h" - -@interface AppDelegate() - -@end - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Insert code here to initialize your application - NSLog(@"didFinishLaunchingWithOptions"); - return YES; -} - -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. -} - -- (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. -} - - -@end diff --git a/render-test/ios/Gemfile b/render-test/ios/Gemfile deleted file mode 100644 index adc90d98cf..0000000000 --- a/render-test/ios/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem "fastlane" \ No newline at end of file diff --git a/render-test/ios/Gemfile.lock b/render-test/ios/Gemfile.lock deleted file mode 100644 index 23018150b9..0000000000 --- a/render-test/ios/Gemfile.lock +++ /dev/null @@ -1,159 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.2) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - atomos (0.1.3) - babosa (1.0.3) - claide (1.0.3) - colored (1.2) - colored2 (3.1.2) - commander-fastlane (4.4.6) - highline (~> 1.7.2) - declarative (0.0.10) - declarative-option (0.1.0) - digest-crc (0.4.1) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.5) - emoji_regex (1.0.1) - excon (0.71.1) - faraday (0.17.3) - multipart-post (>= 1.2, < 3) - faraday-cookie_jar (0.0.6) - faraday (>= 0.7.4) - http-cookie (~> 1.0.0) - faraday_middleware (0.13.1) - faraday (>= 0.7.4, < 1.0) - fastimage (2.1.7) - fastlane (2.139.0) - CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.3, < 3.0.0) - babosa (>= 1.0.2, < 2.0.0) - bundler (>= 1.12.0, < 3.0.0) - colored - commander-fastlane (>= 4.4.6, < 5.0.0) - dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (>= 0.1, < 2.0) - excon (>= 0.71.0, < 1.0.0) - faraday (~> 0.17) - faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 0.13.1) - fastimage (>= 2.1.0, < 3.0.0) - gh_inspector (>= 1.1.2, < 2.0.0) - google-api-client (>= 0.29.2, < 0.37.0) - google-cloud-storage (>= 1.15.0, < 2.0.0) - highline (>= 1.7.2, < 2.0.0) - json (< 3.0.0) - jwt (~> 2.1.0) - mini_magick (>= 4.9.4, < 5.0.0) - multi_xml (~> 0.5) - multipart-post (~> 2.0.0) - plist (>= 3.1.0, < 4.0.0) - public_suffix (~> 2.0.0) - rubyzip (>= 1.3.0, < 2.0.0) - security (= 0.1.3) - simctl (~> 1.6.3) - slack-notifier (>= 2.0.0, < 3.0.0) - terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) - tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.8.0, < 1.0.0) - word_wrap (~> 1.0.0) - xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) - gh_inspector (1.1.3) - google-api-client (0.36.4) - addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.9) - httpclient (>= 2.8.1, < 3.0) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.0) - signet (~> 0.12) - google-cloud-core (1.4.1) - google-cloud-env (~> 1.0) - google-cloud-env (1.3.0) - faraday (~> 0.11) - google-cloud-storage (1.25.0) - addressable (~> 2.5) - digest-crc (~> 0.4) - google-api-client (~> 0.33) - google-cloud-core (~> 1.2) - googleauth (~> 0.9) - mini_mime (~> 1.0) - googleauth (0.10.0) - faraday (~> 0.12) - jwt (>= 1.4, < 3.0) - memoist (~> 0.16) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (~> 0.12) - highline (1.7.10) - http-cookie (1.0.3) - domain_name (~> 0.5) - httpclient (2.8.3) - json (2.3.0) - jwt (2.1.0) - memoist (0.16.2) - mini_magick (4.10.1) - mini_mime (1.0.2) - multi_json (1.14.1) - multi_xml (0.6.0) - multipart-post (2.0.0) - nanaimo (0.2.6) - naturally (2.2.0) - os (1.0.1) - plist (3.5.0) - public_suffix (2.0.5) - representable (3.0.4) - declarative (< 0.1.0) - declarative-option (< 0.2.0) - uber (< 0.2.0) - retriable (3.1.2) - rouge (2.0.7) - rubyzip (1.3.0) - security (0.1.3) - signet (0.12.0) - addressable (~> 2.3) - faraday (~> 0.9) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simctl (1.6.7) - CFPropertyList - naturally - slack-notifier (2.3.2) - terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - tty-cursor (0.7.0) - tty-screen (0.7.0) - tty-spinner (0.9.2) - tty-cursor (~> 0.7) - uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.6) - unicode-display_width (1.6.0) - word_wrap (1.0.0) - xcodeproj (1.14.0) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.3) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.2.6) - xcpretty (0.3.0) - rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.0) - xcpretty (~> 0.2, >= 0.0.7) - -PLATFORMS - ruby - -DEPENDENCIES - fastlane - -BUNDLED WITH - 2.1.4 diff --git a/render-test/ios/LaunchScreen.storyboard b/render-test/ios/LaunchScreen.storyboard deleted file mode 100644 index c9b7564332..0000000000 --- a/render-test/ios/LaunchScreen.storyboard +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/render-test/ios/Main.storyboard b/render-test/ios/Main.storyboard deleted file mode 100644 index 34d4c7e2ec..0000000000 --- a/render-test/ios/Main.storyboard +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/render-test/ios/ViewController.h b/render-test/ios/ViewController.h deleted file mode 100644 index 9c7dfc57ec..0000000000 --- a/render-test/ios/ViewController.h +++ /dev/null @@ -1,6 +0,0 @@ -#import - -@interface ViewController : UIViewController - -@end - diff --git a/render-test/ios/ViewController.m b/render-test/ios/ViewController.m deleted file mode 100644 index e9c526122a..0000000000 --- a/render-test/ios/ViewController.m +++ /dev/null @@ -1,22 +0,0 @@ -#import "ViewController.h" -#import "iosTestRunner.h" - -@interface ViewController () -{ - IosTestRunner* i; -} -@end - -@implementation ViewController - -- (void)viewDidLoad { - [super viewDidLoad]; -// In order to run test runner with app itself instead of with unit test, comment out the following line. -// i = [[IosTestRunner alloc]init]; -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; -} - -@end diff --git a/render-test/ios/ios_test_runner.hpp b/render-test/ios/ios_test_runner.hpp deleted file mode 100644 index 4ec1da93b0..0000000000 --- a/render-test/ios/ios_test_runner.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef ios_test_runner_hpp -#define ios_test_runner_hpp - -#include - -class TestRunner { -public: - TestRunner() = default; - ~TestRunner() = default; - - bool startTest(const std::string& manifest); -}; - -#endif /* ios_test_runner_hpp */ diff --git a/test/ios/AppDelegate.h b/test/ios/AppDelegate.h deleted file mode 100644 index 134c8063dc..0000000000 --- a/test/ios/AppDelegate.h +++ /dev/null @@ -1,7 +0,0 @@ -#import // UIApplicationDelegate - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - -@end \ No newline at end of file diff --git a/test/ios/AppDelegate.m b/test/ios/AppDelegate.m deleted file mode 100644 index 874d18de2a..0000000000 --- a/test/ios/AppDelegate.m +++ /dev/null @@ -1,38 +0,0 @@ -#import "AppDelegate.h" - -@interface AppDelegate() - -@end - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Insert code here to initialize your application - NSLog(@"didFinishLaunchingWithOptions"); - return YES; -} - -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. -} - -- (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. -} - - -@end diff --git a/test/ios/Gemfile b/test/ios/Gemfile deleted file mode 100644 index adc90d98cf..0000000000 --- a/test/ios/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem "fastlane" \ No newline at end of file diff --git a/test/ios/LaunchScreen.storyboard b/test/ios/LaunchScreen.storyboard deleted file mode 100644 index c9b7564332..0000000000 --- a/test/ios/LaunchScreen.storyboard +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/ios/Main.storyboard b/test/ios/Main.storyboard deleted file mode 100644 index 34d4c7e2ec..0000000000 --- a/test/ios/Main.storyboard +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/ios/ViewController.h b/test/ios/ViewController.h deleted file mode 100644 index 9c7dfc57ec..0000000000 --- a/test/ios/ViewController.h +++ /dev/null @@ -1,6 +0,0 @@ -#import - -@interface ViewController : UIViewController - -@end - diff --git a/test/ios/ViewController.m b/test/ios/ViewController.m deleted file mode 100644 index e9c526122a..0000000000 --- a/test/ios/ViewController.m +++ /dev/null @@ -1,22 +0,0 @@ -#import "ViewController.h" -#import "iosTestRunner.h" - -@interface ViewController () -{ - IosTestRunner* i; -} -@end - -@implementation ViewController - -- (void)viewDidLoad { - [super viewDidLoad]; -// In order to run test runner with app itself instead of with unit test, comment out the following line. -// i = [[IosTestRunner alloc]init]; -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; -} - -@end diff --git a/test/ios/iosTestRunner.mm b/test/ios/iosTestRunner.mm index 383b9036ec..d3f6113a05 100644 --- a/test/ios/iosTestRunner.mm +++ b/test/ios/iosTestRunner.mm @@ -1,6 +1,6 @@ #import "iosTestRunner.h" -#include "ios_test_runner.hpp" +#include #include diff --git a/test/ios/ios_test_runner.cpp b/test/ios/ios_test_runner.cpp index 293a2955b5..c99d8c3f30 100644 --- a/test/ios/ios_test_runner.cpp +++ b/test/ios/ios_test_runner.cpp @@ -1,4 +1,4 @@ -#include "ios_test_runner.hpp" +#include #include diff --git a/test/ios/ios_test_runner.hpp b/test/ios/ios_test_runner.hpp deleted file mode 100644 index 3edae22828..0000000000 --- a/test/ios/ios_test_runner.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef ios_test_runner_hpp -#define ios_test_runner_hpp - -#include - -class TestRunner { -public: - TestRunner() = default; - ~TestRunner() = default; - - bool startTest(const std::string& basePath); -}; - -#endif /* ios_test_runner_hpp */ diff --git a/test/ios/main.m b/test/ios/main.m deleted file mode 100644 index f813c8fea9..0000000000 --- a/test/ios/main.m +++ /dev/null @@ -1,9 +0,0 @@ -#import -#import "AppDelegate.h" - -int main(int argc, char * argv[]) -{ - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/test/ios/tests/Tests.m b/test/ios/tests/Tests.m deleted file mode 100644 index 4c2131d61c..0000000000 --- a/test/ios/tests/Tests.m +++ /dev/null @@ -1,37 +0,0 @@ -#import -#import "iosTestRunner.h" -@interface Tests : XCTestCase - -@end - -@implementation Tests - -- (void)setUp { - [super setUp]; -} - -- (void)tearDown { - [super tearDown]; -} - -- (void)testStartUnitTestRunner { - IosTestRunner* runner = [[IosTestRunner alloc] init]; - XCTAssert(runner, @"IOSTestRunner is not initialized correctly"); - - NSString* testResult = [runner getResultPath]; - XCTAssert(testResult, @"IOSTestRunner did not produce a test result file"); - - NSFileManager *fileManager = [NSFileManager defaultManager]; - BOOL fileFound = [fileManager fileExistsAtPath: testResult]; - XCTAssert(fileFound, @"Test result file '%@' does not exit", testResult); - NSURL *resultURL = [NSURL fileURLWithPath:testResult]; - XCTAttachment *attachment1URL = [XCTAttachment attachmentWithContentsOfFileAtURL: resultURL]; - XCTAssert(attachment1URL, @"Failed to attach test result '%@'", testResult); - attachment1URL.lifetime = XCTAttachmentLifetimeKeepAlways; - [self addAttachment:attachment1URL]; - - BOOL success = [runner getTestStatus]; - XCTAssert(success, @"IOSTestRunner reports error because some of the tests are not passed, please check the test report"); -} - -@end -- cgit v1.2.1