From 154463eb6931e205366675dbf57d5048bb9a97c9 Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Thu, 4 Feb 2016 16:43:38 +0300 Subject: [PATCH] [new downloader] Add execution storage integration tests on iOS devices --- .../storage/storage.xcodeproj/project.pbxproj | 302 +++++++++++++++++- .../Info.plist | 69 ++++ 2 files changed, 361 insertions(+), 10 deletions(-) create mode 100644 xcode/storage/storage_integration_device_tests/Info.plist diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index 98deaa0495..2d9fbcf4e1 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -35,9 +35,6 @@ 67247FF91C60BD5900EDE56A /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FF71C60BD5900EDE56A /* libalohalitics.a */; }; 67247FFA1C60BD5900EDE56A /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FF81C60BD5900EDE56A /* libtomcrypt.a */; }; 672480001C60BD7E00EDE56A /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FFF1C60BD7E00EDE56A /* libz.tbd */; }; - 672480131C60CE9300EDE56A /* migrate_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6724800D1C60CE7300EDE56A /* migrate_tests.cpp */; }; - 672480141C60CE9300EDE56A /* storage_group_download_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6724800E1C60CE7300EDE56A /* storage_group_download_tests.cpp */; }; - 672480151C60CE9300EDE56A /* storage_http_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6724800F1C60CE7300EDE56A /* storage_http_tests.cpp */; }; 672480161C60CE9700EDE56A /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FD71C60BA9900EDE56A /* testingmain.cpp */; }; 672480171C60CF7000EDE56A /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FFF1C60BD7E00EDE56A /* libz.tbd */; }; 672480181C60CF7500EDE56A /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FF71C60BD5900EDE56A /* libalohalitics.a */; }; @@ -92,6 +89,72 @@ 675343191A3F5A2600A0A8C3 /* storage_defines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343021A3F5A2600A0A8C3 /* storage_defines.hpp */; }; 6753431A1A3F5A2600A0A8C3 /* storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343031A3F5A2600A0A8C3 /* storage.cpp */; }; 6753431B1A3F5A2600A0A8C3 /* storage.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343041A3F5A2600A0A8C3 /* storage.hpp */; }; + 676C83BC1C637B1000DC9603 /* migrate_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6724800D1C60CE7300EDE56A /* migrate_tests.cpp */; }; + 676C83BD1C637B1000DC9603 /* storage_group_download_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6724800E1C60CE7300EDE56A /* storage_group_download_tests.cpp */; }; + 676C83BE1C637B1000DC9603 /* storage_http_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6724800F1C60CE7300EDE56A /* storage_http_tests.cpp */; }; + 676C83BF1C637B1500DC9603 /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FD71C60BA9900EDE56A /* testingmain.cpp */; }; + 676C83C41C637FE500DC9603 /* storage_downloading_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676C83C01C637FAE00DC9603 /* storage_downloading_tests.cpp */; }; + 676C83C51C637FE800DC9603 /* storage_update_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676C83C11C637FAE00DC9603 /* storage_update_tests.cpp */; }; + 676C83C61C63839E00DC9603 /* libagg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709AF1C6215690093DD1B /* libagg.a */; }; + 676C83C71C63839E00DC9603 /* libapi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709B01C6215690093DD1B /* libapi.a */; }; + 676C83C81C63839E00DC9603 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709B11C6215690093DD1B /* libeditor.a */; }; + 676C83C91C63839E00DC9603 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709B21C6215690093DD1B /* libfreetype.a */; }; + 676C83CA1C63839E00DC9603 /* libfribidi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709B31C6215690093DD1B /* libfribidi.a */; }; + 676C83CB1C63839E00DC9603 /* liblodepng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709B41C6215690093DD1B /* liblodepng.a */; }; + 676C83CC1C63839E00DC9603 /* libminizip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709B51C6215690093DD1B /* libminizip.a */; }; + 676C83CD1C63839E00DC9603 /* liboauthcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709B61C6215690093DD1B /* liboauthcpp.a */; }; + 676C83CE1C63839E00DC9603 /* libopening_hours.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709B71C6215690093DD1B /* libopening_hours.a */; }; + 676C83CF1C63839E00DC9603 /* libosrm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709B81C6215690093DD1B /* libosrm.a */; }; + 676C83D01C63839E00DC9603 /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709B91C6215690093DD1B /* libprotobuf.a */; }; + 676C83D11C63839E00DC9603 /* librouting.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709BA1C6215690093DD1B /* librouting.a */; }; + 676C83D21C63839E00DC9603 /* libsdf_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709BB1C6215690093DD1B /* libsdf_image.a */; }; + 676C83D31C63839E00DC9603 /* libsearch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709BC1C6215690093DD1B /* libsearch.a */; }; + 676C83D41C63839E00DC9603 /* libstb_image.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709BD1C6215690093DD1B /* libstb_image.a */; }; + 676C83D51C63839E00DC9603 /* libsuccinct.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709BE1C6215690093DD1B /* libsuccinct.a */; }; + 676C83D61C63839E00DC9603 /* libdrape_frontend.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709AD1C62151D0093DD1B /* libdrape_frontend.a */; }; + 676C83D71C63839E00DC9603 /* libdrape.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709A71C6215000093DD1B /* libdrape.a */; }; + 676C83D81C63839E00DC9603 /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709A81C6215000093DD1B /* libexpat.a */; }; + 676C83D91C63839E00DC9603 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709A91C6215000093DD1B /* libpugixml.a */; }; + 676C83DA1C63839E00DC9603 /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 674709A51C6213F10093DD1B /* libmap.a */; }; + 676C83DB1C63839E00DC9603 /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FF71C60BD5900EDE56A /* libalohalitics.a */; }; + 676C83DC1C63839E00DC9603 /* libtomcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FF81C60BD5900EDE56A /* libtomcrypt.a */; }; + 676C83DD1C63839E00DC9603 /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FF31C60BD4000EDE56A /* libcoding.a */; }; + 676C83DE1C63839E00DC9603 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FF41C60BD4000EDE56A /* libjansson.a */; }; + 676C83DF1C63839E00DC9603 /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FF11C60BD1400EDE56A /* libindexer.a */; }; + 676C83E01C63839E00DC9603 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FEC1C60BC0D00EDE56A /* libbase.a */; }; + 676C83E11C63839E00DC9603 /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FED1C60BC0D00EDE56A /* libgeometry.a */; }; + 676C83E21C63839E00DC9603 /* libplatform_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FE21C60BBCE00EDE56A /* libplatform_tests_support.a */; }; + 676C83E31C63839E00DC9603 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FE31C60BBCE00EDE56A /* libplatform.a */; }; + 676C83E41C6383A300DC9603 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FFF1C60BD7E00EDE56A /* libz.tbd */; }; + 676C83E61C6383A700DC9603 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FEA1C60BC0000EDE56A /* IOKit.framework */; }; + 676C83E71C6383A700DC9603 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FE81C60BBF600EDE56A /* SystemConfiguration.framework */; }; + 676C83EA1C63850A00DC9603 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 676C83E91C63850A00DC9603 /* OpenGLES.framework */; }; + 676C83F01C6385A600DC9603 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 676C83EF1C6385A600DC9603 /* CoreGraphics.framework */; }; + 676C83F11C6385B700DC9603 /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675342E01A3F59EF00A0A8C3 /* libstorage.a */; }; + 676C83F31C63865500DC9603 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 676C83F21C63865500DC9603 /* UIKit.framework */; }; + 676C83F51C6386A900DC9603 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 676C83F41C6386A900DC9603 /* Foundation.framework */; }; + 676C83F71C6386B800DC9603 /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 676C83F61C6386B800DC9603 /* AdSupport.framework */; }; + 676C84071C63884300DC9603 /* categories.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83F91C63884300DC9603 /* categories.txt */; }; + 676C84081C63884300DC9603 /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FA1C63884300DC9603 /* classificator.txt */; }; + 676C84091C63884300DC9603 /* countries_migrate.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FB1C63884300DC9603 /* countries_migrate.txt */; }; + 676C840A1C63884300DC9603 /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FC1C63884300DC9603 /* countries.txt */; }; + 676C840B1C63884300DC9603 /* drules_proto_clear.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FD1C63884300DC9603 /* drules_proto_clear.bin */; }; + 676C840C1C63884300DC9603 /* drules_proto_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FE1C63884300DC9603 /* drules_proto_dark.bin */; }; + 676C840D1C63884300DC9603 /* drules_proto_legacy.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FF1C63884300DC9603 /* drules_proto_legacy.bin */; }; + 676C840E1C63884300DC9603 /* drules_proto-bw.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C84001C63884300DC9603 /* drules_proto-bw.bin */; }; + 676C840F1C63884300DC9603 /* drules_proto.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C84011C63884300DC9603 /* drules_proto.bin */; }; + 676C84101C63884300DC9603 /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C84021C63884300DC9603 /* patterns.txt */; }; + 676C84111C63884300DC9603 /* types.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C84031C63884300DC9603 /* types.txt */; }; + 676C84121C63884300DC9603 /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 676C84041C63884300DC9603 /* World.mwm */; }; + 676C84131C63884300DC9603 /* WorldCoasts_migrate.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 676C84051C63884300DC9603 /* WorldCoasts_migrate.mwm */; }; + 676C84141C63884300DC9603 /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 676C84061C63884300DC9603 /* WorldCoasts.mwm */; }; + 676C84161C63888200DC9603 /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C84151C63888200DC9603 /* packed_polygons.bin */; }; + 676C84181C6388A100DC9603 /* packed_polygons_migrate.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C84171C6388A100DC9603 /* packed_polygons_migrate.bin */; }; + 676C84191C6389C700DC9603 /* storage_downloading_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676C83C01C637FAE00DC9603 /* storage_downloading_tests.cpp */; }; + 676C841A1C6389CD00DC9603 /* storage_update_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676C83C11C637FAE00DC9603 /* storage_update_tests.cpp */; }; + 676C841B1C6389D000DC9603 /* migrate_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6724800D1C60CE7300EDE56A /* migrate_tests.cpp */; }; + 676C841C1C6389D300DC9603 /* storage_group_download_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6724800E1C60CE7300EDE56A /* storage_group_download_tests.cpp */; }; + 676C841D1C6389D600DC9603 /* storage_http_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6724800F1C60CE7300EDE56A /* storage_http_tests.cpp */; }; 67AF4A001BC579DD0048B1ED /* country_info_getter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67AF49FE1BC579DD0048B1ED /* country_info_getter.cpp */; }; 67AF4A011BC579DD0048B1ED /* country_info_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67AF49FF1BC579DD0048B1ED /* country_info_getter.hpp */; }; /* End PBXBuildFile section */ @@ -191,6 +254,31 @@ 675343021A3F5A2600A0A8C3 /* storage_defines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = storage_defines.hpp; sourceTree = ""; }; 675343031A3F5A2600A0A8C3 /* storage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage.cpp; sourceTree = ""; }; 675343041A3F5A2600A0A8C3 /* storage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = storage.hpp; sourceTree = ""; }; + 676C83A51C637A4300DC9603 /* storage_integration_device_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = storage_integration_device_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 676C83B81C637A4300DC9603 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 676C83C01C637FAE00DC9603 /* storage_downloading_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_downloading_tests.cpp; sourceTree = ""; }; + 676C83C11C637FAE00DC9603 /* storage_update_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_update_tests.cpp; sourceTree = ""; }; + 676C83E91C63850A00DC9603 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; }; + 676C83EF1C6385A600DC9603 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; }; + 676C83F21C63865500DC9603 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + 676C83F41C6386A900DC9603 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + 676C83F61C6386B800DC9603 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/System/Library/Frameworks/AdSupport.framework; sourceTree = DEVELOPER_DIR; }; + 676C83F91C63884300DC9603 /* categories.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = categories.txt; sourceTree = ""; }; + 676C83FA1C63884300DC9603 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = classificator.txt; sourceTree = ""; }; + 676C83FB1C63884300DC9603 /* countries_migrate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = countries_migrate.txt; sourceTree = ""; }; + 676C83FC1C63884300DC9603 /* countries.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = countries.txt; sourceTree = ""; }; + 676C83FD1C63884300DC9603 /* drules_proto_clear.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_clear.bin; sourceTree = ""; }; + 676C83FE1C63884300DC9603 /* drules_proto_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_dark.bin; sourceTree = ""; }; + 676C83FF1C63884300DC9603 /* drules_proto_legacy.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_legacy.bin; sourceTree = ""; }; + 676C84001C63884300DC9603 /* drules_proto-bw.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = "drules_proto-bw.bin"; sourceTree = ""; }; + 676C84011C63884300DC9603 /* drules_proto.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto.bin; sourceTree = ""; }; + 676C84021C63884300DC9603 /* patterns.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = patterns.txt; sourceTree = ""; }; + 676C84031C63884300DC9603 /* types.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = types.txt; sourceTree = ""; }; + 676C84041C63884300DC9603 /* World.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = World.mwm; sourceTree = ""; }; + 676C84051C63884300DC9603 /* WorldCoasts_migrate.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts_migrate.mwm; sourceTree = ""; }; + 676C84061C63884300DC9603 /* WorldCoasts.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts.mwm; sourceTree = ""; }; + 676C84151C63888200DC9603 /* packed_polygons.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons.bin; sourceTree = ""; }; + 676C84171C6388A100DC9603 /* packed_polygons_migrate.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons_migrate.bin; sourceTree = ""; }; 67AF49FE1BC579DD0048B1ED /* country_info_getter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_info_getter.cpp; sourceTree = ""; }; 67AF49FF1BC579DD0048B1ED /* country_info_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_info_getter.hpp; sourceTree = ""; }; /* End PBXFileReference section */ @@ -267,6 +355,52 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 676C83A21C637A4300DC9603 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 676C83F71C6386B800DC9603 /* AdSupport.framework in Frameworks */, + 676C83F51C6386A900DC9603 /* Foundation.framework in Frameworks */, + 676C83F31C63865500DC9603 /* UIKit.framework in Frameworks */, + 676C83F11C6385B700DC9603 /* libstorage.a in Frameworks */, + 676C83F01C6385A600DC9603 /* CoreGraphics.framework in Frameworks */, + 676C83EA1C63850A00DC9603 /* OpenGLES.framework in Frameworks */, + 676C83CA1C63839E00DC9603 /* libfribidi.a in Frameworks */, + 676C83DF1C63839E00DC9603 /* libindexer.a in Frameworks */, + 676C83DA1C63839E00DC9603 /* libmap.a in Frameworks */, + 676C83D61C63839E00DC9603 /* libdrape_frontend.a in Frameworks */, + 676C83C81C63839E00DC9603 /* libeditor.a in Frameworks */, + 676C83C71C63839E00DC9603 /* libapi.a in Frameworks */, + 676C83CE1C63839E00DC9603 /* libopening_hours.a in Frameworks */, + 676C83CB1C63839E00DC9603 /* liblodepng.a in Frameworks */, + 676C83DB1C63839E00DC9603 /* libalohalitics.a in Frameworks */, + 676C83D31C63839E00DC9603 /* libsearch.a in Frameworks */, + 676C83E71C6383A700DC9603 /* SystemConfiguration.framework in Frameworks */, + 676C83D21C63839E00DC9603 /* libsdf_image.a in Frameworks */, + 676C83E01C63839E00DC9603 /* libbase.a in Frameworks */, + 676C83CC1C63839E00DC9603 /* libminizip.a in Frameworks */, + 676C83DE1C63839E00DC9603 /* libjansson.a in Frameworks */, + 676C83D41C63839E00DC9603 /* libstb_image.a in Frameworks */, + 676C83D71C63839E00DC9603 /* libdrape.a in Frameworks */, + 676C83DC1C63839E00DC9603 /* libtomcrypt.a in Frameworks */, + 676C83D81C63839E00DC9603 /* libexpat.a in Frameworks */, + 676C83D91C63839E00DC9603 /* libpugixml.a in Frameworks */, + 676C83E11C63839E00DC9603 /* libgeometry.a in Frameworks */, + 676C83D11C63839E00DC9603 /* librouting.a in Frameworks */, + 676C83CF1C63839E00DC9603 /* libosrm.a in Frameworks */, + 676C83E31C63839E00DC9603 /* libplatform.a in Frameworks */, + 676C83C61C63839E00DC9603 /* libagg.a in Frameworks */, + 676C83D01C63839E00DC9603 /* libprotobuf.a in Frameworks */, + 676C83E61C6383A700DC9603 /* IOKit.framework in Frameworks */, + 676C83C91C63839E00DC9603 /* libfreetype.a in Frameworks */, + 676C83DD1C63839E00DC9603 /* libcoding.a in Frameworks */, + 676C83E41C6383A300DC9603 /* libz.tbd in Frameworks */, + 676C83CD1C63839E00DC9603 /* liboauthcpp.a in Frameworks */, + 676C83E21C63839E00DC9603 /* libplatform_tests_support.a in Frameworks */, + 676C83D51C63839E00DC9603 /* libsuccinct.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -292,7 +426,6 @@ 672480011C60BF2F00EDE56A /* libs */ = { isa = PBXGroup; children = ( - 674709CF1C621E330093DD1B /* OpenGL.framework */, 674709AF1C6215690093DD1B /* libagg.a */, 674709B01C6215690093DD1B /* libapi.a */, 674709B11C6215690093DD1B /* libeditor.a */, @@ -314,7 +447,6 @@ 674709A81C6215000093DD1B /* libexpat.a */, 674709A91C6215000093DD1B /* libpugixml.a */, 674709A51C6213F10093DD1B /* libmap.a */, - 67247FFF1C60BD7E00EDE56A /* libz.tbd */, 67247FF71C60BD5900EDE56A /* libalohalitics.a */, 67247FF81C60BD5900EDE56A /* libtomcrypt.a */, 67247FF31C60BD4000EDE56A /* libcoding.a */, @@ -322,11 +454,18 @@ 67247FF11C60BD1400EDE56A /* libindexer.a */, 67247FEC1C60BC0D00EDE56A /* libbase.a */, 67247FED1C60BC0D00EDE56A /* libgeometry.a */, + 67247FE21C60BBCE00EDE56A /* libplatform_tests_support.a */, + 67247FE31C60BBCE00EDE56A /* libplatform.a */, + 67247FFF1C60BD7E00EDE56A /* libz.tbd */, + 676C83F61C6386B800DC9603 /* AdSupport.framework */, + 676C83F41C6386A900DC9603 /* Foundation.framework */, + 676C83F21C63865500DC9603 /* UIKit.framework */, + 676C83EF1C6385A600DC9603 /* CoreGraphics.framework */, + 676C83E91C63850A00DC9603 /* OpenGLES.framework */, + 674709CF1C621E330093DD1B /* OpenGL.framework */, 67247FEA1C60BC0000EDE56A /* IOKit.framework */, 67247FE81C60BBF600EDE56A /* SystemConfiguration.framework */, 67247FE61C60BBE700EDE56A /* Cocoa.framework */, - 67247FE21C60BBCE00EDE56A /* libplatform_tests_support.a */, - 67247FE31C60BBCE00EDE56A /* libplatform.a */, ); name = libs; sourceTree = ""; @@ -334,6 +473,8 @@ 672480071C60CE3D00EDE56A /* storage_integration_tests */ = { isa = PBXGroup; children = ( + 676C83C01C637FAE00DC9603 /* storage_downloading_tests.cpp */, + 676C83C11C637FAE00DC9603 /* storage_update_tests.cpp */, 6724800D1C60CE7300EDE56A /* migrate_tests.cpp */, 6724800E1C60CE7300EDE56A /* storage_group_download_tests.cpp */, 6724800F1C60CE7300EDE56A /* storage_http_tests.cpp */, @@ -350,6 +491,7 @@ 675342E21A3F59EF00A0A8C3 /* storage */, 67247FBD1C60B89B00EDE56A /* storage_tests */, 672480071C60CE3D00EDE56A /* storage_integration_tests */, + 676C83A61C637A4300DC9603 /* storage_integration_device_tests */, 675342E11A3F59EF00A0A8C3 /* Products */, ); sourceTree = ""; @@ -360,6 +502,7 @@ 675342E01A3F59EF00A0A8C3 /* libstorage.a */, 67247FBC1C60B89B00EDE56A /* storage_tests */, 672480061C60CE3D00EDE56A /* storage_integration_tests */, + 676C83A51C637A4300DC9603 /* storage_integration_device_tests.app */, ); name = Products; sourceTree = ""; @@ -394,6 +537,39 @@ path = ../../storage; sourceTree = ""; }; + 676C83A61C637A4300DC9603 /* storage_integration_device_tests */ = { + isa = PBXGroup; + children = ( + 676C83F81C6387D000DC9603 /* Resources */, + 676C83B81C637A4300DC9603 /* Info.plist */, + ); + path = storage_integration_device_tests; + sourceTree = ""; + }; + 676C83F81C6387D000DC9603 /* Resources */ = { + isa = PBXGroup; + children = ( + 676C84171C6388A100DC9603 /* packed_polygons_migrate.bin */, + 676C84151C63888200DC9603 /* packed_polygons.bin */, + 676C83F91C63884300DC9603 /* categories.txt */, + 676C83FA1C63884300DC9603 /* classificator.txt */, + 676C83FB1C63884300DC9603 /* countries_migrate.txt */, + 676C83FC1C63884300DC9603 /* countries.txt */, + 676C83FD1C63884300DC9603 /* drules_proto_clear.bin */, + 676C83FE1C63884300DC9603 /* drules_proto_dark.bin */, + 676C83FF1C63884300DC9603 /* drules_proto_legacy.bin */, + 676C84001C63884300DC9603 /* drules_proto-bw.bin */, + 676C84011C63884300DC9603 /* drules_proto.bin */, + 676C84021C63884300DC9603 /* patterns.txt */, + 676C84031C63884300DC9603 /* types.txt */, + 676C84041C63884300DC9603 /* World.mwm */, + 676C84051C63884300DC9603 /* WorldCoasts_migrate.mwm */, + 676C84061C63884300DC9603 /* WorldCoasts.mwm */, + ); + name = Resources; + path = ../../../data; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -474,6 +650,23 @@ productReference = 675342E01A3F59EF00A0A8C3 /* libstorage.a */; productType = "com.apple.product-type.library.static"; }; + 676C83A41C637A4300DC9603 /* storage_integration_device_tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 676C83BB1C637A4300DC9603 /* Build configuration list for PBXNativeTarget "storage_integration_device_tests" */; + buildPhases = ( + 676C83A11C637A4300DC9603 /* Sources */, + 676C83A21C637A4300DC9603 /* Frameworks */, + 676C83A31C637A4300DC9603 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = storage_integration_device_tests; + productName = storage_integration_device_tests; + productReference = 676C83A51C637A4300DC9603 /* storage_integration_device_tests.app */; + productType = "com.apple.product-type.application"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -492,6 +685,9 @@ 675342DF1A3F59EF00A0A8C3 = { CreatedOnToolsVersion = 6.1; }; + 676C83A41C637A4300DC9603 = { + CreatedOnToolsVersion = 7.2; + }; }; }; buildConfigurationList = 675342DB1A3F59EF00A0A8C3 /* Build configuration list for PBXProject "storage" */; @@ -500,6 +696,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 675342D71A3F59EF00A0A8C3; productRefGroup = 675342E11A3F59EF00A0A8C3 /* Products */; @@ -509,10 +706,37 @@ 675342DF1A3F59EF00A0A8C3 /* storage */, 67247FBB1C60B89B00EDE56A /* storage_tests */, 672480051C60CE3D00EDE56A /* storage_integration_tests */, + 676C83A41C637A4300DC9603 /* storage_integration_device_tests */, ); }; /* End PBXProject section */ +/* Begin PBXResourcesBuildPhase section */ + 676C83A31C637A4300DC9603 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 676C84111C63884300DC9603 /* types.txt in Resources */, + 676C84081C63884300DC9603 /* classificator.txt in Resources */, + 676C84131C63884300DC9603 /* WorldCoasts_migrate.mwm in Resources */, + 676C840F1C63884300DC9603 /* drules_proto.bin in Resources */, + 676C84091C63884300DC9603 /* countries_migrate.txt in Resources */, + 676C840E1C63884300DC9603 /* drules_proto-bw.bin in Resources */, + 676C840D1C63884300DC9603 /* drules_proto_legacy.bin in Resources */, + 676C84071C63884300DC9603 /* categories.txt in Resources */, + 676C840B1C63884300DC9603 /* drules_proto_clear.bin in Resources */, + 676C84121C63884300DC9603 /* World.mwm in Resources */, + 676C840A1C63884300DC9603 /* countries.txt in Resources */, + 676C840C1C63884300DC9603 /* drules_proto_dark.bin in Resources */, + 676C84181C6388A100DC9603 /* packed_polygons_migrate.bin in Resources */, + 676C84161C63888200DC9603 /* packed_polygons.bin in Resources */, + 676C84101C63884300DC9603 /* patterns.txt in Resources */, + 676C84141C63884300DC9603 /* WorldCoasts.mwm in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 67247FB81C60B89B00EDE56A /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -533,10 +757,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 672480151C60CE9300EDE56A /* storage_http_tests.cpp in Sources */, - 672480141C60CE9300EDE56A /* storage_group_download_tests.cpp in Sources */, - 672480131C60CE9300EDE56A /* migrate_tests.cpp in Sources */, + 676C83C41C637FE500DC9603 /* storage_downloading_tests.cpp in Sources */, + 676C841B1C6389D000DC9603 /* migrate_tests.cpp in Sources */, 672480161C60CE9700EDE56A /* testingmain.cpp in Sources */, + 676C841D1C6389D600DC9603 /* storage_http_tests.cpp in Sources */, + 676C841C1C6389D300DC9603 /* storage_group_download_tests.cpp in Sources */, + 676C83C51C637FE800DC9603 /* storage_update_tests.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -556,6 +782,19 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 676C83A11C637A4300DC9603 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 676C83BE1C637B1000DC9603 /* storage_http_tests.cpp in Sources */, + 676C84191C6389C700DC9603 /* storage_downloading_tests.cpp in Sources */, + 676C841A1C6389CD00DC9603 /* storage_update_tests.cpp in Sources */, + 676C83BD1C637B1000DC9603 /* storage_group_download_tests.cpp in Sources */, + 676C83BC1C637B1000DC9603 /* migrate_tests.cpp in Sources */, + 676C83BF1C637B1500DC9603 /* testingmain.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -785,6 +1024,41 @@ }; name = Release; }; + 676C83B91C637A4300DC9603 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEBUG_INFORMATION_FORMAT = dwarf; + GCC_NO_COMMON_BLOCKS = YES; + INFOPLIST_FILE = storage_integration_device_tests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.2; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.storage-integration-device-tests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 676C83BA1C637A4300DC9603 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + GCC_NO_COMMON_BLOCKS = YES; + INFOPLIST_FILE = storage_integration_device_tests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.2; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "mail.ru.storage-integration-device-tests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -824,6 +1098,14 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 676C83BB1C637A4300DC9603 /* Build configuration list for PBXNativeTarget "storage_integration_device_tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 676C83B91C637A4300DC9603 /* Debug */, + 676C83BA1C637A4300DC9603 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; /* End XCConfigurationList section */ }; rootObject = 675342D81A3F59EF00A0A8C3 /* Project object */; diff --git a/xcode/storage/storage_integration_device_tests/Info.plist b/xcode/storage/storage_integration_device_tests/Info.plist new file mode 100644 index 0000000000..3163602045 --- /dev/null +++ b/xcode/storage/storage_integration_device_tests/Info.plist @@ -0,0 +1,69 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + com.mapwithme.tests + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + NSExceptionDomains + + maps.me + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + + mapswithme.com + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + + + + +