diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-04-05 10:03:28 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-04-05 10:03:28 +0200 |
| commit | dbf9c4209352f355a67a8400aab1659272c80703 (patch) | |
| tree | 002b3141a47bf8ce0581ecbc6a5349fe62b40574 /cpp | |
| parent | Fix (ICE-7742) - Ice/faultTolerance Python 3.6 crash when using pip packages (diff) | |
| download | ice-dbf9c4209352f355a67a8400aab1659272c80703.tar.bz2 ice-dbf9c4209352f355a67a8400aab1659272c80703.tar.xz ice-dbf9c4209352f355a67a8400aab1659272c80703.zip | |
Fixed C++/Objective-C controllerApp projects to no longer reference armv7, removed obsolete testSuiteApp
Diffstat (limited to 'cpp')
37 files changed, 4 insertions, 2550 deletions
diff --git a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj index 9fa970de1eb..ad832226493 100644 --- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj +++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj @@ -680,10 +680,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 armv7s"; }; name = Debug; }; @@ -722,10 +723,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; + VALID_ARCHS = "arm64 armv7s"; }; name = Release; }; diff --git a/cpp/test/ios/testSuiteApp/C++ Test Suite.entitlements b/cpp/test/ios/testSuiteApp/C++ Test Suite.entitlements deleted file mode 100644 index 903def2af53..00000000000 --- a/cpp/test/ios/testSuiteApp/C++ Test Suite.entitlements +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>aps-environment</key> - <string>development</string> -</dict> -</plist> diff --git a/cpp/test/ios/testSuiteApp/C++ Test Suite.xcodeproj/project.pbxproj b/cpp/test/ios/testSuiteApp/C++ Test Suite.xcodeproj/project.pbxproj deleted file mode 100755 index 8305e373205..00000000000 --- a/cpp/test/ios/testSuiteApp/C++ Test Suite.xcodeproj/project.pbxproj +++ /dev/null @@ -1,635 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 47; - objects = { - -/* Begin PBXBuildFile section */ - 14103B101CFC5E0E0097DE5A /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; - 14103B111CFC5E0E0097DE5A /* TestSelect.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B7662B0E8D55FE00CE4701 /* TestSelect.xib */; }; - 14103B131CFC5E0E0097DE5A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D8842ED91BFF87E700A8B607 /* Images.xcassets */; }; - 14103B141CFC5E0E0097DE5A /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D8842EDB1BFF885600A8B607 /* Default-568h@2x.png */; }; - 14103B171CFC5E0E0097DE5A /* TestSelect-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34730A10122BF6C300D293CC /* TestSelect-iPad.xib */; }; - 14103B181CFC5E0E0097DE5A /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34C618AE122C035000F60A28 /* MainWindow-iPad.xib */; }; - 14103B191CFC5E0E0097DE5A /* TestView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 82CD7277145795AA008B9128 /* TestView.xib */; }; - 14103B1A1CFC5E0E0097DE5A /* TestView-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 82F883221461D37000FC801E /* TestView-iPad.xib */; }; - 14103B1C1CFC5E0E0097DE5A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 820C84641455AC460091443F /* main.m */; }; - 14103B1D1CFC5E0E0097DE5A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 82601FF314564F5500B09B8F /* AppDelegate.mm */; }; - 14103B1E1CFC5E0E0097DE5A /* TestViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 827BCF99145778A5003AD3FA /* TestViewController.mm */; }; - 14103B1F1CFC5E0E0097DE5A /* TestSelectController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8214397917024FDF0016E162 /* TestSelectController.m */; }; - 14103B201CFC5E0E0097DE5A /* TestUtil.mm in Sources */ = {isa = PBXBuildFile; fileRef = 821439B61704E6960016E162 /* TestUtil.mm */; }; - 14103B221CFC5E0E0097DE5A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; - 14103B231CFC5E0E0097DE5A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; - 14103B241CFC5E0E0097DE5A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 344126360FD8E8EA00C8D69C /* Security.framework */; }; - 14103B251CFC5E0E0097DE5A /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 344126370FD8E8EA00C8D69C /* CFNetwork.framework */; }; - 14103B261CFC5E0E0097DE5A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E396620FF1D71400FBACD6 /* CoreGraphics.framework */; }; - 144B48261A78F71F00C0E06B /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; - 144B48271A78F71F00C0E06B /* TestSelect.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B7662B0E8D55FE00CE4701 /* TestSelect.xib */; }; - 144B482C1A78F71F00C0E06B /* TestSelect-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34730A10122BF6C300D293CC /* TestSelect-iPad.xib */; }; - 144B482D1A78F71F00C0E06B /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34C618AE122C035000F60A28 /* MainWindow-iPad.xib */; }; - 144B482E1A78F71F00C0E06B /* TestView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 82CD7277145795AA008B9128 /* TestView.xib */; }; - 144B482F1A78F71F00C0E06B /* TestView-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 82F883221461D37000FC801E /* TestView-iPad.xib */; }; - 144B48331A78F71F00C0E06B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 820C84641455AC460091443F /* main.m */; }; - 144B48341A78F71F00C0E06B /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 82601FF314564F5500B09B8F /* AppDelegate.mm */; }; - 144B48351A78F71F00C0E06B /* TestViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 827BCF99145778A5003AD3FA /* TestViewController.mm */; }; - 144B48361A78F71F00C0E06B /* TestSelectController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8214397917024FDF0016E162 /* TestSelectController.m */; }; - 144B48371A78F71F00C0E06B /* TestUtil.mm in Sources */ = {isa = PBXBuildFile; fileRef = 821439B61704E6960016E162 /* TestUtil.mm */; }; - 144B48391A78F71F00C0E06B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; - 144B483A1A78F71F00C0E06B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; - 144B483B1A78F71F00C0E06B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 344126360FD8E8EA00C8D69C /* Security.framework */; }; - 144B483C1A78F71F00C0E06B /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 344126370FD8E8EA00C8D69C /* CFNetwork.framework */; }; - 144B483D1A78F71F00C0E06B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E396620FF1D71400FBACD6 /* CoreGraphics.framework */; }; - 148ABA201DFEBBA400594F70 /* certs in Resources */ = {isa = PBXBuildFile; fileRef = 148ABA1F1DFEBBA400594F70 /* certs */; }; - 148ABA241DFEBBBA00594F70 /* cacert.der in Resources */ = {isa = PBXBuildFile; fileRef = 148ABA211DFEBBBA00594F70 /* cacert.der */; }; - 148ABA251DFEBBBA00594F70 /* client.p12 in Resources */ = {isa = PBXBuildFile; fileRef = 148ABA221DFEBBBA00594F70 /* client.p12 */; }; - 148ABA261DFEBBBA00594F70 /* server.p12 in Resources */ = {isa = PBXBuildFile; fileRef = 148ABA231DFEBBBA00594F70 /* server.p12 */; }; - 14905C6C1DF9908E002AE61B /* C++11 Test Suite-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 14905C6B1DF9908E002AE61B /* C++11 Test Suite-Info.plist */; }; - D8842EDA1BFF87E700A8B607 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D8842ED91BFF87E700A8B607 /* Images.xcassets */; }; - D8842EDC1BFF885600A8B607 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D8842EDB1BFF885600A8B607 /* Default-568h@2x.png */; }; -/* End PBXBuildFile section */ - -/* Begin PBXBuildRule section */ - D8D23B201D8AF59E00EE192D /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.proxy.script; - filePatterns = "*.ice"; - fileType = pattern.proxy; - isEditable = 1; - outputFiles = ( - "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).cpp", - "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h", - ); - script = "/usr/local/bin/icebuilder --cpp"; - }; -/* End PBXBuildRule section */ - -/* Begin PBXFileReference section */ - 14103B2B1CFC5E0E0097DE5A /* C++11 Test Suite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "C++11 Test Suite.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 144B48931A78F71F00C0E06B /* C++ Test Suite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "C++ Test Suite.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 1477FACD1A652B7E00BC2890 /* C++98 Test Suite-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "C++98 Test Suite-Info.plist"; sourceTree = "<group>"; }; - 148668D31B6BAFD300234C12 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; }; - 148ABA1F1DFEBBA400594F70 /* certs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = certs; path = ../../IceSSL/certs; sourceTree = "<group>"; }; - 148ABA211DFEBBBA00594F70 /* cacert.der */ = {isa = PBXFileReference; lastKnownFileType = file; name = cacert.der; path = ../../../../certs/cacert.der; sourceTree = "<group>"; }; - 148ABA221DFEBBBA00594F70 /* client.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; name = client.p12; path = ../../../../certs/client.p12; sourceTree = "<group>"; }; - 148ABA231DFEBBBA00594F70 /* server.p12 */ = {isa = PBXFileReference; lastKnownFileType = file; name = server.p12; path = ../../../../certs/server.p12; sourceTree = "<group>"; }; - 14905C6B1DF9908E002AE61B /* C++11 Test Suite-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "C++11 Test Suite-Info.plist"; sourceTree = "<group>"; }; - 14EA328B1DF8117C00B63D43 /* C++ Test Suite.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "C++ Test Suite.entitlements"; sourceTree = "<group>"; }; - 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; }; - 344126360FD8E8EA00C8D69C /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; - 344126370FD8E8EA00C8D69C /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; - 34730A10122BF6C300D293CC /* TestSelect-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "TestSelect-iPad.xib"; sourceTree = "<group>"; }; - 34885BE11227F66E0060DE41 /* ExternalAccessory.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExternalAccessory.framework; path = System/Library/Frameworks/ExternalAccessory.framework; sourceTree = SDKROOT; }; - 34B7662B0E8D55FE00CE4701 /* TestSelect.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TestSelect.xib; sourceTree = "<group>"; }; - 34C618AE122C035000F60A28 /* MainWindow-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = "MainWindow-iPad.xib"; sourceTree = "<group>"; }; - 34E396620FF1D71400FBACD6 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 820C84641455AC460091443F /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; - 8214397917024FDF0016E162 /* TestSelectController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = TestSelectController.m; sourceTree = "<group>"; }; - 821439B51704E6950016E162 /* TestUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestUtil.h; sourceTree = "<group>"; }; - 821439B61704E6960016E162 /* TestUtil.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestUtil.mm; sourceTree = "<group>"; }; - 82601FE71456320100B09B8F /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; - 82601FEA14563AFE00B09B8F /* TestSelectController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestSelectController.h; sourceTree = "<group>"; }; - 82601FEC14563AFF00B09B8F /* TestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestViewController.h; sourceTree = "<group>"; }; - 82601FF314564F5500B09B8F /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppDelegate.mm; sourceTree = "<group>"; }; - 827BCF99145778A5003AD3FA /* TestViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestViewController.mm; sourceTree = "<group>"; }; - 82CD7277145795AA008B9128 /* TestView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TestView.xib; sourceTree = "<group>"; }; - 82F883221461D37000FC801E /* TestView-iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "TestView-iPad.xib"; sourceTree = "<group>"; }; - D8842ED91BFF87E700A8B607 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; }; - D8842EDB1BFF885600A8B607 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 14103B211CFC5E0E0097DE5A /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 14103B221CFC5E0E0097DE5A /* Foundation.framework in Frameworks */, - 14103B231CFC5E0E0097DE5A /* UIKit.framework in Frameworks */, - 14103B241CFC5E0E0097DE5A /* Security.framework in Frameworks */, - 14103B251CFC5E0E0097DE5A /* CFNetwork.framework in Frameworks */, - 14103B261CFC5E0E0097DE5A /* CoreGraphics.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 144B48381A78F71F00C0E06B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 144B48391A78F71F00C0E06B /* Foundation.framework in Frameworks */, - 144B483A1A78F71F00C0E06B /* UIKit.framework in Frameworks */, - 144B483B1A78F71F00C0E06B /* Security.framework in Frameworks */, - 144B483C1A78F71F00C0E06B /* CFNetwork.framework in Frameworks */, - 144B483D1A78F71F00C0E06B /* CoreGraphics.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 080E96DDFE201D6D7F000001 /* Classes */ = { - isa = PBXGroup; - children = ( - 821439B51704E6950016E162 /* TestUtil.h */, - 821439B61704E6960016E162 /* TestUtil.mm */, - 8214397917024FDF0016E162 /* TestSelectController.m */, - 827BCF99145778A5003AD3FA /* TestViewController.mm */, - 82601FF314564F5500B09B8F /* AppDelegate.mm */, - 82601FEA14563AFE00B09B8F /* TestSelectController.h */, - 82601FEC14563AFF00B09B8F /* TestViewController.h */, - 82601FE71456320100B09B8F /* AppDelegate.h */, - ); - path = Classes; - sourceTree = "<group>"; - }; - 19C28FACFE9D520D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 144B48931A78F71F00C0E06B /* C++ Test Suite.app */, - 14103B2B1CFC5E0E0097DE5A /* C++11 Test Suite.app */, - ); - name = Products; - sourceTree = "<group>"; - }; - 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { - isa = PBXGroup; - children = ( - 14EA328B1DF8117C00B63D43 /* C++ Test Suite.entitlements */, - 148668D31B6BAFD300234C12 /* README.md */, - 080E96DDFE201D6D7F000001 /* Classes */, - 29B97315FDCFA39411CA2CEA /* Other Sources */, - 29B97317FDCFA39411CA2CEA /* Resources */, - 34730A09122BF68100D293CC /* Resources-iPad */, - 29B97323FDCFA39411CA2CEA /* Frameworks */, - 19C28FACFE9D520D11CA2CBB /* Products */, - 1477FACD1A652B7E00BC2890 /* C++98 Test Suite-Info.plist */, - 14905C6B1DF9908E002AE61B /* C++11 Test Suite-Info.plist */, - ); - name = CustomTemplate; - sourceTree = "<group>"; - }; - 29B97315FDCFA39411CA2CEA /* Other Sources */ = { - isa = PBXGroup; - children = ( - 820C84641455AC460091443F /* main.m */, - ); - name = "Other Sources"; - sourceTree = "<group>"; - }; - 29B97317FDCFA39411CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - 148ABA211DFEBBBA00594F70 /* cacert.der */, - 148ABA221DFEBBBA00594F70 /* client.p12 */, - 148ABA231DFEBBBA00594F70 /* server.p12 */, - 148ABA1F1DFEBBA400594F70 /* certs */, - D8842EDB1BFF885600A8B607 /* Default-568h@2x.png */, - D8842ED91BFF87E700A8B607 /* Images.xcassets */, - 28AD733E0D9D9553002E5188 /* MainWindow.xib */, - 34B7662B0E8D55FE00CE4701 /* TestSelect.xib */, - 82CD7277145795AA008B9128 /* TestView.xib */, - ); - name = Resources; - sourceTree = "<group>"; - }; - 29B97323FDCFA39411CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( - 34885BE11227F66E0060DE41 /* ExternalAccessory.framework */, - 34E396620FF1D71400FBACD6 /* CoreGraphics.framework */, - 344126360FD8E8EA00C8D69C /* Security.framework */, - 344126370FD8E8EA00C8D69C /* CFNetwork.framework */, - 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */, - 1D30AB110D05D00D00671497 /* Foundation.framework */, - ); - name = Frameworks; - sourceTree = "<group>"; - }; - 34730A09122BF68100D293CC /* Resources-iPad */ = { - isa = PBXGroup; - children = ( - 82F883221461D37000FC801E /* TestView-iPad.xib */, - 34C618AE122C035000F60A28 /* MainWindow-iPad.xib */, - 34730A10122BF6C300D293CC /* TestSelect-iPad.xib */, - ); - name = "Resources-iPad"; - sourceTree = "<group>"; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 14103B0E1CFC5E0E0097DE5A /* C++11 Test Suite */ = { - isa = PBXNativeTarget; - buildConfigurationList = 14103B281CFC5E0E0097DE5A /* Build configuration list for PBXNativeTarget "C++11 Test Suite" */; - buildPhases = ( - 14103B0F1CFC5E0E0097DE5A /* Resources */, - 14103B1B1CFC5E0E0097DE5A /* Sources */, - 14103B211CFC5E0E0097DE5A /* Frameworks */, - 14103B271CFC5E0E0097DE5A /* Run Script */, - ); - buildRules = ( - D8D23B201D8AF59E00EE192D /* PBXBuildRule */, - ); - dependencies = ( - ); - name = "C++11 Test Suite"; - productName = container; - productReference = 14103B2B1CFC5E0E0097DE5A /* C++11 Test Suite.app */; - productType = "com.apple.product-type.application"; - }; - 144B48241A78F71F00C0E06B /* C++98 Test Suite */ = { - isa = PBXNativeTarget; - buildConfigurationList = 144B48901A78F71F00C0E06B /* Build configuration list for PBXNativeTarget "C++98 Test Suite" */; - buildPhases = ( - 144B48251A78F71F00C0E06B /* Resources */, - 144B48321A78F71F00C0E06B /* Sources */, - 144B48381A78F71F00C0E06B /* Frameworks */, - 144B488F1A78F71F00C0E06B /* Run Script */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "C++98 Test Suite"; - productName = container; - productReference = 144B48931A78F71F00C0E06B /* C++ Test Suite.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0810; - TargetAttributes = { - 14103B0E1CFC5E0E0097DE5A = { - DevelopmentTeam = U4TBVKNQ7F; - }; - 144B48241A78F71F00C0E06B = { - DevelopmentTeam = U4TBVKNQ7F; - ProvisioningStyle = Automatic; - SystemCapabilities = { - com.apple.Push = { - enabled = 1; - }; - }; - }; - }; - }; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "C++ Test Suite" */; - compatibilityVersion = "Xcode 6.3"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - en, - ); - mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 144B48241A78F71F00C0E06B /* C++98 Test Suite */, - 14103B0E1CFC5E0E0097DE5A /* C++11 Test Suite */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 14103B0F1CFC5E0E0097DE5A /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 14103B101CFC5E0E0097DE5A /* MainWindow.xib in Resources */, - 14103B111CFC5E0E0097DE5A /* TestSelect.xib in Resources */, - 14103B131CFC5E0E0097DE5A /* Images.xcassets in Resources */, - 14103B141CFC5E0E0097DE5A /* Default-568h@2x.png in Resources */, - 14103B171CFC5E0E0097DE5A /* TestSelect-iPad.xib in Resources */, - 14103B181CFC5E0E0097DE5A /* MainWindow-iPad.xib in Resources */, - 14103B191CFC5E0E0097DE5A /* TestView.xib in Resources */, - 14103B1A1CFC5E0E0097DE5A /* TestView-iPad.xib in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 144B48251A78F71F00C0E06B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 148ABA201DFEBBA400594F70 /* certs in Resources */, - 144B48261A78F71F00C0E06B /* MainWindow.xib in Resources */, - 144B48271A78F71F00C0E06B /* TestSelect.xib in Resources */, - 148ABA241DFEBBBA00594F70 /* cacert.der in Resources */, - D8842EDA1BFF87E700A8B607 /* Images.xcassets in Resources */, - D8842EDC1BFF885600A8B607 /* Default-568h@2x.png in Resources */, - 148ABA251DFEBBBA00594F70 /* client.p12 in Resources */, - 144B482C1A78F71F00C0E06B /* TestSelect-iPad.xib in Resources */, - 144B482D1A78F71F00C0E06B /* MainWindow-iPad.xib in Resources */, - 14905C6C1DF9908E002AE61B /* C++11 Test Suite-Info.plist in Resources */, - 144B482E1A78F71F00C0E06B /* TestView.xib in Resources */, - 148ABA261DFEBBBA00594F70 /* server.p12 in Resources */, - 144B482F1A78F71F00C0E06B /* TestView-iPad.xib in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 14103B271CFC5E0E0097DE5A /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 12; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "#\n# We don't use a CopyFile build phase here to copy the test bundles because the test\n# bundles are located in different location depending on the platform. This script\n# copies the bundles if updated and sign them.\n#\n\nFRAMEWORKS_PATH=\"${TARGET_BUILD_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\ncd \"../bundles/Bundles++11-${PLATFORM_NAME}\"\nif [ ! -d \"$FRAMEWORKS_PATH\" ]; then\n mkdir -p \"$FRAMEWORKS_PATH\"\nfi;\nfor i in `ls -d */*.bundle`;\ndo\n if [ ! -d \"$FRAMEWORKS_PATH/$i\" -o \"$i\" -nt \"$FRAMEWORKS_PATH/$i\" ]; then\n echo \"Copying $i\"\n mkdir -p \"$FRAMEWORKS_PATH/$(dirname $i)\"\n cp -rf $i \"$FRAMEWORKS_PATH/$(dirname $i)\"\n if [ -n \"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\" ]; then\n codesign --force --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --preserve-metadata=identifier,entitlements \"${FRAMEWORKS_PATH}/$i\"\n fi;\n fi;\ndone\n\n"; - }; - 144B488F1A78F71F00C0E06B /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 12; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "#\n# We don't use a CopyFile build phase here to copy the test bundles because the test\n# bundles are located in different location depending on the platform. This script\n# copies the bundles if updated and sign them.\n#\n\nFRAMEWORKS_PATH=\"${TARGET_BUILD_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\ncd \"../bundles/Bundles-${PLATFORM_NAME}\"\nif [ ! -d \"$FRAMEWORKS_PATH\" ]; then\n mkdir -p \"$FRAMEWORKS_PATH\"\nfi;\nfor i in `ls -d */*.bundle`;\ndo\n if [ ! -d \"$FRAMEWORKS_PATH/$i\" -o \"$i\" -nt \"$FRAMEWORKS_PATH/$i\" ]; then\n echo \"Copying $i\"\n mkdir -p \"$FRAMEWORKS_PATH/$(dirname $i)\"\n cp -rf $i \"$FRAMEWORKS_PATH/$(dirname $i)\"\n if [ -n \"${EXPANDED_CODE_SIGN_IDENTITY_NAME}\" ]; then\n codesign --force --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" --preserve-metadata=identifier,entitlements \"${FRAMEWORKS_PATH}/$i\"\n fi;\n fi;\ndone\n\n"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 14103B1B1CFC5E0E0097DE5A /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 14103B1C1CFC5E0E0097DE5A /* main.m in Sources */, - 14103B1D1CFC5E0E0097DE5A /* AppDelegate.mm in Sources */, - 14103B1E1CFC5E0E0097DE5A /* TestViewController.mm in Sources */, - 14103B1F1CFC5E0E0097DE5A /* TestSelectController.m in Sources */, - 14103B201CFC5E0E0097DE5A /* TestUtil.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 144B48321A78F71F00C0E06B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 144B48331A78F71F00C0E06B /* main.m in Sources */, - 144B48341A78F71F00C0E06B /* AppDelegate.mm in Sources */, - 144B48351A78F71F00C0E06B /* TestViewController.mm in Sources */, - 144B48361A78F71F00C0E06B /* TestSelectController.m in Sources */, - 144B48371A78F71F00C0E06B /* TestUtil.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 14103B291CFC5E0E0097DE5A /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = U4TBVKNQ7F; - GCC_DYNAMIC_NO_PIC = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ""; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; - HEADER_SEARCH_PATHS = ( - Classes, - ../../include/, - ); - INFOPLIST_FILE = "$(SRCROOT)/C++11 Test Suite-Info.plist"; - OTHER_CFLAGS = ""; - OTHER_CPLUSPLUSFLAGS = ( - "-DICE_CPP11_MAPPING", - "$(OTHER_CFLAGS)", - ); - OTHER_LDFLAGS = ( - "-lIce++11", - "-lIceGrid++11", - "-lIceStorm++11", - "-lGlacier2++11", - "-lbz2", - "-liconv", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Ice-Cpp-Test-Suite"; - PRODUCT_NAME = "$(TARGET_NAME)"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphoneos; - SLICE_CPP_FLAG = ""; - SLICE_INCLUDE_PATH = ""; - STRIP_STYLE = debugging; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 14103B2A1CFC5E0E0097DE5A /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = U4TBVKNQ7F; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ""; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; - HEADER_SEARCH_PATHS = ( - Classes, - ../../include/, - ); - INFOPLIST_FILE = "$(SRCROOT)/C++11 Test Suite-Info.plist"; - OTHER_CFLAGS = ""; - OTHER_CPLUSPLUSFLAGS = ( - "-DICE_CPP11_MAPPING", - "$(OTHER_CFLAGS)", - ); - OTHER_LDFLAGS = ( - "-lIce++11", - "-lIceGrid++11", - "-lIceStorm++11", - "-lGlacier2++11", - "-lbz2", - "-liconv", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Ice-Cpp-Test-Suite"; - PRODUCT_NAME = "$(TARGET_NAME)"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphoneos; - SLICE_CPP_FLAG = ""; - SLICE_INCLUDE_PATH = ""; - STRIP_STYLE = debugging; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 144B48911A78F71F00C0E06B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = "C++ Test Suite.entitlements"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = U4TBVKNQ7F; - GCC_DYNAMIC_NO_PIC = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ""; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; - HEADER_SEARCH_PATHS = ( - Classes, - ../../include/, - ); - INFOPLIST_FILE = "$(SRCROOT)/C++98 Test Suite-Info.plist"; - PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Ice-Cpp-Test-Suite"; - PRODUCT_NAME = "C++ Test Suite"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphoneos; - STRIP_STYLE = debugging; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 144B48921A78F71F00C0E06B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = "C++ Test Suite.entitlements"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = U4TBVKNQ7F; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ""; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; - HEADER_SEARCH_PATHS = ( - Classes, - ../../include/, - ); - INFOPLIST_FILE = "$(SRCROOT)/C++98 Test Suite-Info.plist"; - PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Ice-Cpp-Test-Suite"; - PRODUCT_NAME = "C++ Test Suite"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - SDKROOT = iphoneos; - STRIP_STYLE = debugging; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - C01FCF4F08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ADDITIONAL_SDKS = "../../../../IceSDK/$(PLATFORM_NAME).sdk"; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "$(IDENTIFIER)"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - }; - name = Debug; - }; - C01FCF5008A954540054247B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ADDITIONAL_SDKS = "../../../../IceSDK/$(PLATFORM_NAME).sdk"; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - SDKROOT = iphoneos; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 14103B281CFC5E0E0097DE5A /* Build configuration list for PBXNativeTarget "C++11 Test Suite" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 14103B291CFC5E0E0097DE5A /* Debug */, - 14103B2A1CFC5E0E0097DE5A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 144B48901A78F71F00C0E06B /* Build configuration list for PBXNativeTarget "C++98 Test Suite" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 144B48911A78F71F00C0E06B /* Debug */, - 144B48921A78F71F00C0E06B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "C++ Test Suite" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4F08A954540054247B /* Debug */, - C01FCF5008A954540054247B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; -} diff --git a/cpp/test/ios/testSuiteApp/C++ Test Suite.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/cpp/test/ios/testSuiteApp/C++ Test Suite.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 0e7018e8c78..00000000000 --- a/cpp/test/ios/testSuiteApp/C++ Test Suite.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Workspace - version = "1.0"> - <FileRef - location = "self:/Users/benoit/Devel/GitHub/ice/cpp/test/ios/C++ Test Suite.xcodeproj"> - </FileRef> -</Workspace> diff --git a/cpp/test/ios/testSuiteApp/C++11 Test Suite-Info.plist b/cpp/test/ios/testSuiteApp/C++11 Test Suite-Info.plist deleted file mode 100644 index dd48f53e201..00000000000 --- a/cpp/test/ios/testSuiteApp/C++11 Test Suite-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>en</string> - <key>CFBundleDisplayName</key> - <string>Test Suite</string> - <key>CFBundleExecutable</key> - <string>${EXECUTABLE_NAME}</string> - <key>CFBundleIcons</key> - <dict/> - <key>CFBundleIcons~ipad</key> - <dict/> - <key>CFBundleIdentifier</key> - <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>${PRODUCT_NAME}</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>1.0</string> - <key>LSRequiresIPhoneOS</key> - <true/> - <key>NSMainNibFile</key> - <string>MainWindow</string> - <key>NSMainNibFile~ipad</key> - <string>MainWindow-iPad</string> - <key>UIRequiresFullScreen</key> - <true/> -</dict> -</plist> diff --git a/cpp/test/ios/testSuiteApp/C++11 Test Suite.plist b/cpp/test/ios/testSuiteApp/C++11 Test Suite.plist deleted file mode 100644 index dd48f53e201..00000000000 --- a/cpp/test/ios/testSuiteApp/C++11 Test Suite.plist +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>en</string> - <key>CFBundleDisplayName</key> - <string>Test Suite</string> - <key>CFBundleExecutable</key> - <string>${EXECUTABLE_NAME}</string> - <key>CFBundleIcons</key> - <dict/> - <key>CFBundleIcons~ipad</key> - <dict/> - <key>CFBundleIdentifier</key> - <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>${PRODUCT_NAME}</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>1.0</string> - <key>LSRequiresIPhoneOS</key> - <true/> - <key>NSMainNibFile</key> - <string>MainWindow</string> - <key>NSMainNibFile~ipad</key> - <string>MainWindow-iPad</string> - <key>UIRequiresFullScreen</key> - <true/> -</dict> -</plist> diff --git a/cpp/test/ios/testSuiteApp/C++98 Test Suite-Info.plist b/cpp/test/ios/testSuiteApp/C++98 Test Suite-Info.plist deleted file mode 100644 index dd48f53e201..00000000000 --- a/cpp/test/ios/testSuiteApp/C++98 Test Suite-Info.plist +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>en</string> - <key>CFBundleDisplayName</key> - <string>Test Suite</string> - <key>CFBundleExecutable</key> - <string>${EXECUTABLE_NAME}</string> - <key>CFBundleIcons</key> - <dict/> - <key>CFBundleIcons~ipad</key> - <dict/> - <key>CFBundleIdentifier</key> - <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>${PRODUCT_NAME}</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>1.0</string> - <key>LSRequiresIPhoneOS</key> - <true/> - <key>NSMainNibFile</key> - <string>MainWindow</string> - <key>NSMainNibFile~ipad</key> - <string>MainWindow-iPad</string> - <key>UIRequiresFullScreen</key> - <true/> -</dict> -</plist> diff --git a/cpp/test/ios/testSuiteApp/Classes/AppDelegate.h b/cpp/test/ios/testSuiteApp/Classes/AppDelegate.h deleted file mode 100644 index fa77203b97c..00000000000 --- a/cpp/test/ios/testSuiteApp/Classes/AppDelegate.h +++ /dev/null @@ -1,34 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#import <UIKit/UIKit.h> - -@interface AppDelegate : NSObject <UIApplicationDelegate> -{ -@private - - UIWindow *window; - IBOutlet UINavigationController *navigationController; - NSArray* testSuites; - NSInteger currentTestSuite; - NSString* protocol; - BOOL loop; -} - -@property (nonatomic, retain) IBOutlet UIWindow *window; -@property (nonatomic, retain) IBOutlet UINavigationController* navigationController; -@property (nonatomic, readonly) NSArray* testSuites; -@property (nonatomic) NSInteger currentTestSuite; -@property (nonatomic, retain) NSString* protocol; -@property (nonatomic) BOOL loop; - --(BOOL)testCompleted:(BOOL)success; - -@end - diff --git a/cpp/test/ios/testSuiteApp/Classes/AppDelegate.mm b/cpp/test/ios/testSuiteApp/Classes/AppDelegate.mm deleted file mode 100644 index e117fb3834d..00000000000 --- a/cpp/test/ios/testSuiteApp/Classes/AppDelegate.mm +++ /dev/null @@ -1,232 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#import <AppDelegate.h> -#import <TestUtil.h> - -static NSArray* protocols = @[ @"tcp", @"ssl", @"ws", @"wss" ]; - -static NSArray* clientServer = @[ [TestCase testCase:@"client/server" client:nil server:nil args:nil] ]; - -static NSArray* clientServerAndCollocated = @[ - [TestCase testCase:@"client/server" client:nil server:nil args:nil], - [TestCase testCase:@"collocated" client:nil server:nil args:nil], -]; - -static NSArray* clientOnly = @[ [TestCase testCase:@"client" client:nil server:nil args:nil] ]; - -static NSArray* slicedArgs = @[@"--Ice.Default.SlicedFormat"]; -static NSArray* encoding10Args = @[@"--Ice.Default.EncodingVersion=1.0"]; - -static NSArray* allTests = @[ - [TestSuite testSuite:@"Ice/proxy" testCases:clientServerAndCollocated], - [TestSuite testSuite:@"Ice/operations" testCases:@[ - [TestCase testCase:@"client/server" client:nil server:nil args:nil], - [TestCase testCase:@"client/amd server" client:nil server:nil args:nil], - [TestCase testCase:@"collocated" client:nil server:nil args:nil], - ]], - [TestSuite testSuite:@"Ice/exceptions" testCases:@[ - [TestCase testCase:@"client/server with compact format" client:nil server:nil args:nil], - [TestCase testCase:@"client/server with sliced format" client:nil server:nil args:slicedArgs], - [TestCase testCase:@"client/server with 1.0 encoding" client:nil server:nil args:encoding10Args], - [TestCase testCase:@"client/amd server with compact format" client:nil server:nil args:nil], - [TestCase testCase:@"client/amd server with sliced format" client:nil server:nil args:slicedArgs], - [TestCase testCase:@"client/amd server with 1.0 encoding" client:nil server:nil args:encoding10Args], - [TestCase testCase:@"collocated" client:nil server:nil args:nil], - ]], - [TestSuite testSuite:@"Ice/ami" testCases:clientServer], - [TestSuite testSuite:@"Ice/info" testCases:clientServer], - [TestSuite testSuite:@"Ice/inheritance" testCases:clientServerAndCollocated], - [TestSuite testSuite:@"Ice/facets" testCases:clientServerAndCollocated], - [TestSuite testSuite:@"Ice/objects" testCases:@[ - [TestCase testCase:@"client/server with compact format" client:nil server:nil args:nil], - [TestCase testCase:@"client/server with sliced format" client:nil server:nil args:slicedArgs], - [TestCase testCase:@"client/server with 1.0 encoding" client:nil server:nil args:encoding10Args], - [TestCase testCase:@"collocated" client:nil server:nil args:nil], - ]], - [TestSuite testSuite:@"Ice/optional" testCases:@[ - [TestCase testCase:@"client/server with compact format" client:nil server:nil args:nil], - [TestCase testCase:@"client/server with sliced format" client:nil server:nil args:slicedArgs], - [TestCase testCase:@"client/amd server with compact format" client:nil server:nil args:nil], - [TestCase testCase:@"client/amd server with sliced format" client:nil server:nil args:slicedArgs], - ]], - [TestSuite testSuite:@"Ice/binding" testCases:clientServer], - [TestSuite testSuite:@"Ice/location" testCases:clientServer], - [TestSuite testSuite:@"Ice/adapterDeactivation" testCases:clientServerAndCollocated], - [TestSuite testSuite:@"Ice/slicing/objects" testCases:@[ - [TestCase testCase:@"client/server with sliced format" client:nil server:nil args:slicedArgs], - [TestCase testCase:@"client/server with 1.0 encoding" client:nil server:nil args:encoding10Args], - [TestCase testCase:@"client/amd server with sliced format" client:nil server:nil args:slicedArgs], - [TestCase testCase:@"client/amd server with 1.0 encoding" client:nil server:nil args:encoding10Args], - ]], - [TestSuite testSuite:@"Ice/slicing/exceptions" testCases:@[ - [TestCase testCase:@"client/server with sliced format" client:nil server:nil args:slicedArgs], - [TestCase testCase:@"client/server with 1.0 encoding" client:nil server:nil args:encoding10Args], - [TestCase testCase:@"client/amd server with sliced format" client:nil server:nil args:slicedArgs], - [TestCase testCase:@"client/amd server with 1.0 encoding" client:nil server:nil args:encoding10Args], - ]], - [TestSuite testSuite:@"Ice/dispatcher" testCases:clientServer], - [TestSuite testSuite:@"Ice/stream" testCases:clientOnly], - [TestSuite testSuite:@"Ice/hold" testCases:clientServer], - [TestSuite testSuite:@"Ice/custom" testCases:@[ - [TestCase testCase:@"client/server" client:nil server:nil args:nil], - [TestCase testCase:@"client/amd server" client:nil server:nil args:nil], - [TestCase testCase:@"collocated" client:nil server:nil args:nil], - ]], - [TestSuite testSuite:@"Ice/retry" testCases:clientServer], - [TestSuite testSuite:@"Ice/timeout" testCases:clientServer], - [TestSuite testSuite:@"Ice/interceptor" testCases:clientOnly], - [TestSuite testSuite:@"Ice/udp" testCases:clientServer], - [TestSuite testSuite:@"Ice/defaultServant" testCases:clientOnly], - [TestSuite testSuite:@"Ice/defaultValue" testCases:clientOnly], - [TestSuite testSuite:@"Ice/servantLocator" testCases:@[ - [TestCase testCase:@"client/server" client:nil server:nil args:nil], - [TestCase testCase:@"client/amd server" client:nil server:nil args:nil], - [TestCase testCase:@"collocated" client:nil server:nil args:nil], - ]], - [TestSuite testSuite:@"Ice/invoke" testCases:clientServer], - [TestSuite testSuite:@"Ice/hash" testCases:clientOnly], - [TestSuite testSuite:@"Ice/admin" testCases:clientServer], - [TestSuite testSuite:@"Ice/metrics" testCases:clientServer], - [TestSuite testSuite:@"Ice/enums" testCases:@[ - [TestCase testCase:@"client/server with default encoding" client:nil server:nil args:slicedArgs], - [TestCase testCase:@"client/server with 1.0 encoding" client:nil server:nil args:encoding10Args], - ]], - [TestSuite testSuite:@"Ice/services" testCases:clientOnly], - [TestSuite testSuite:@"IceSSL/configuration" testCases:clientServer], -]; - -@implementation AppDelegate - -@synthesize window; -@synthesize navigationController; -@synthesize testSuites; -@synthesize currentTestSuite; -@synthesize loop; - -static NSString* currentTestSuiteKey = @"currentTestSuiteKey"; -static NSString* protocolKey = @"protocolKey"; - -+(void)initialize -{ - NSDictionary* appDefaults = [NSDictionary dictionaryWithObjectsAndKeys: - @"0", currentTestSuiteKey, - @"tcp", protocolKey, - nil]; - [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults]; -} - --(id)init -{ - if(self = [super init]) - { - testSuites = [allTests retain]; - for(TestSuite* testSuite in allTests) - { - for(TestCase* testCase in testSuite.testCases) - { - if(testCase.client == nil) - { - if([testCase.name rangeOfString:@"client/server"].location == 0) - { - testCase.client = @"client.bundle"; - testCase.server = @"server.bundle"; - } - else if([testCase.name rangeOfString:@"client/amd server"].location == 0) - { - testCase.client = @"client.bundle"; - testCase.server = @"serveramd.bundle"; - } - else if([testCase.name isEqualToString:@"collocated"]) - { - testCase.client = @"collocated.bundle"; - } - else - { - testCase.client = @"client.bundle"; - } - } - } - } - - // Initialize the application defaults. - currentTestSuite = [[NSUserDefaults standardUserDefaults] integerForKey:currentTestSuiteKey]; - if(currentTestSuite < 0 || currentTestSuite > testSuites.count) - { - currentTestSuite = 0; - } - - protocol = @"tcp"; - NSString* confProt = [[NSUserDefaults standardUserDefaults] stringForKey:protocolKey]; - for(id p in protocols) - { - if([p isEqualToString:confProt]) - { - protocol = confProt; - } - } - loop = NO; - } - return self; -} - -- (void)applicationDidFinishLaunching:(UIApplication *)application -{ - - // Override point for customization after app launch - [window setRootViewController:navigationController]; - [window makeKeyAndVisible]; -} - -- (void)dealloc -{ - [testSuites release]; - [protocol release]; - [navigationController release]; - [window release]; - [super dealloc]; -} - --(NSInteger)currentTestSuite -{ - return currentTestSuite; -} - --(void)setCurrentTestSuite:(NSInteger)test -{ - currentTestSuite = test; - - [[NSUserDefaults standardUserDefaults] setObject:[NSNumber numberWithInteger:currentTestSuite] forKey:currentTestSuiteKey]; -} - --(NSString*)protocol -{ - return protocol; -} - --(void)setProtocol:(NSString*)v -{ - protocol = [v retain]; - [[NSUserDefaults standardUserDefaults] setObject:v forKey:protocolKey]; -} - --(BOOL)testCompleted:(BOOL)success -{ - if(success) - { - self.currentTestSuite = (currentTestSuite + 1) % testSuites.count; - if(loop) - { - return YES; - } - } - return NO; -} - -@end diff --git a/cpp/test/ios/testSuiteApp/Classes/TestSelectController.h b/cpp/test/ios/testSuiteApp/Classes/TestSelectController.h deleted file mode 100644 index 612877969e1..00000000000 --- a/cpp/test/ios/testSuiteApp/Classes/TestSelectController.h +++ /dev/null @@ -1,26 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#import <UIKit/UIKit.h> - -@class TestViewController; - -@interface TestSelectController : UIViewController<UIPickerViewDataSource, UIPickerViewDelegate> -{ -@private - IBOutlet UIPickerView* pickerView; - IBOutlet UISegmentedControl* protocol; - IBOutlet UISwitch* loopSwitch; - NSArray* testSuites; - TestViewController *testViewController; -} - --(IBAction)runTest:(id)sender; - -@end diff --git a/cpp/test/ios/testSuiteApp/Classes/TestSelectController.m b/cpp/test/ios/testSuiteApp/Classes/TestSelectController.m deleted file mode 100644 index d765db5bfae..00000000000 --- a/cpp/test/ios/testSuiteApp/Classes/TestSelectController.m +++ /dev/null @@ -1,125 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#import <TestSelectController.h> -#import <TestUtil.h> -#import <AppDelegate.h> -#import <TestViewController.h> - -@interface TestSelectController() - -@property (nonatomic, retain) NSArray* testSuites; -@property (nonatomic, retain) UIPickerView* pickerView; -@property (nonatomic, retain) UISegmentedControl* protocol; -@property (nonatomic, retain) TestViewController* testViewController; - -@end - -@implementation TestSelectController - -@synthesize testSuites; -@synthesize pickerView; -@synthesize protocol; -@synthesize testViewController; - -- (void)viewDidLoad -{ - AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate]; - self.testSuites = appDelegate.testSuites; - [super viewDidLoad]; -} - --(void)viewWillAppear:(BOOL)animated -{ - AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate]; - [pickerView selectRow:appDelegate.currentTestSuite inComponent:0 animated:NO]; - for (int i = 0; i != [self.protocol numberOfSegments]; ++i) - { - if([[self.protocol titleForSegmentAtIndex:i] isEqualToString:[appDelegate.protocol uppercaseString]]) - { - self.protocol.selectedSegmentIndex = i; - break; - } - } -} - -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation -{ - // Return YES for supported orientations - return (interfaceOrientation == UIInterfaceOrientationPortrait); -} - -- (void)didReceiveMemoryWarning -{ - [super didReceiveMemoryWarning]; // Releases the view if it doesn't have a superview - // Release anything that's not essential, such as cached data -} - -- (void)dealloc -{ - [testSuites release]; - [pickerView release]; - [protocol release]; - [loopSwitch release]; - [testViewController release]; - - [super dealloc]; -} - --(TestViewController*)testViewController -{ - // Instantiate the test view controller if necessary. - if(testViewController == nil) - { - NSString* nib; - if(UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) - { - nib = @"TestView-iPad"; - } - else - { - nib = @"TestView"; - } - testViewController = [[TestViewController alloc] initWithNibName:nib bundle:nil]; - } - return testViewController; -} - -#pragma mark - - --(IBAction)runTest:(id)sender -{ - NSInteger row = [pickerView selectedRowInComponent:0]; - AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate]; - appDelegate.currentTestSuite = row; - appDelegate.protocol = [[protocol titleForSegmentAtIndex:[protocol selectedSegmentIndex]] lowercaseString]; - appDelegate.loop = loopSwitch.isOn; - [self.navigationController pushViewController:self.testViewController animated:YES]; -} - -#pragma mark UIPickerViewDelegate - -- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component -{ - TestSuite* test = (TestSuite*)[testSuites objectAtIndex:row]; - return test.testSuiteId; -} - -#pragma mark UIPickerViewDataSource - -- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView -{ - return 1; -} - -- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)componen -{ - return testSuites.count; -} -@end diff --git a/cpp/test/ios/testSuiteApp/Classes/TestUtil.h b/cpp/test/ios/testSuiteApp/Classes/TestUtil.h deleted file mode 100644 index e670b53a739..00000000000 --- a/cpp/test/ios/testSuiteApp/Classes/TestUtil.h +++ /dev/null @@ -1,100 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef TEST_UTIL_H -#define TEST_UTIL_H - -#include <TestHelper.h> -#include <UIKit/UIKit.h> -#include <Foundation/NSString.h> - -#include <vector> - -@interface TestSuite : NSObject -{ -@private - NSString* testSuiteId; - NSArray* testCases; -} -@property (nonatomic, retain) NSString* testSuiteId; -@property (nonatomic, retain) NSArray* testCases; -+(id) testSuite:(NSString*)testSuiteId testCases:(NSArray*)testCases; --(BOOL) isIn:(NSArray*)tests; -@end - -@interface TestCase : NSObject -{ -@private - NSString* name; - NSString* client; - NSString* server; - NSArray* args; -} -+(id) testCase:(NSString*)name client:(NSString*)client server:(NSString*)server args:(NSArray*)args; -@property (nonatomic, retain) NSString* name; -@property (nonatomic, retain) NSString* client; -@property (nonatomic, retain) NSString* server; -@property (nonatomic, retain) NSArray* args; -@end - -typedef int (*MAIN_ENTRY_POINT)(int argc, char** argv, Test::MainHelper* helper); -typedef int (*SHUTDOWN_ENTRY_POINT)(); - -enum TestType { TestTypeClient, TestTypeServer }; - -struct TestConfig -{ - std::string protocol; - std::vector<std::string> args; -}; - -class MainHelperI : public Test::MainHelper -{ -public: - - MainHelperI(const std::string&, const std::string&, TestType, TestConfig, id, SEL, SEL); - virtual ~MainHelperI(); - - virtual void run(); - virtual void serverReady(); - virtual void shutdown(); - virtual void waitForCompleted() { }; - virtual bool redirect(); - virtual void print(const std::string&); - - int - status() - { - return _status; - } - -private: - - void - completed(int status) - { - _completed = true; - _status = status; - } - - std::string _name; - std::string _libName; - TestType _type; - TestConfig _config; - CFBundleRef _handle; - SHUTDOWN_ENTRY_POINT _dllTestShutdown; - bool _completed; - int _status; - - id _target; - SEL _ready; - SEL _output; -}; - -#endif diff --git a/cpp/test/ios/testSuiteApp/Classes/TestUtil.mm b/cpp/test/ios/testSuiteApp/Classes/TestUtil.mm deleted file mode 100644 index 826f8217a84..00000000000 --- a/cpp/test/ios/testSuiteApp/Classes/TestUtil.mm +++ /dev/null @@ -1,232 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <TestUtil.h> -#include <dlfcn.h> -#include <stdarg.h> -#include <stdlib.h> - -#include <vector> -#include <string> - -#import <Foundation/NSString.h> -#import <Foundation/NSObject.h> -#import <Foundation/NSThread.h> - -using namespace std; - -@implementation TestSuite -@synthesize testSuiteId; -@synthesize testCases; - -+(id) testSuite:(NSString*)testSuiteId testCases:(NSArray*)testCases -{ - TestSuite* testSuite = [[TestSuite alloc] init]; - if(testSuite != nil) - { - testSuite->testSuiteId = testSuiteId; - testSuite->testCases = testCases; - } - return [testSuite autorelease]; -} - --(BOOL) isIn:(NSArray*)tests -{ - for(NSString* t in tests) - { - if([t isEqualToString:testSuiteId]) - { - return TRUE; - } - } - return FALSE; -} -@end - -@implementation TestCase -@synthesize name; -@synthesize client; -@synthesize server; -@synthesize args; - -+(id) testCase:(NSString*)name client:(NSString*)client server:(NSString*)server args:(NSArray*)args -{ - TestCase* testCase = [[TestCase alloc] init]; - if(testCase != nil) - { - testCase->name = name; - testCase->client = client; - testCase->server = server; - testCase->args = args; - } - return [testCase autorelease]; -} -@end - -MainHelperI::MainHelperI(const string& test, const string& libName, TestType type, TestConfig config, - id target, SEL out, SEL ready) : - _name(test), - _libName(libName), - _type(type), - _config(config), - _completed(false), - _status(0), - _target(target), - _output(out), - _ready(ready) -{ -} - -MainHelperI::~MainHelperI() -{ - if(_handle) - { - CFBundleUnloadExecutable(_handle); - } -} - -void -MainHelperI::run() -{ - // - // Compose the path of the Test.bundle resources folder - // - NSString* bundlePath = [[NSBundle mainBundle] privateFrameworksPath]; - - bundlePath = [bundlePath stringByAppendingPathComponent:[NSString stringWithUTF8String:_libName.c_str()]]; - - NSURL* bundleURL = [NSURL fileURLWithPath:bundlePath]; - _handle = CFBundleCreate(NULL, (CFURLRef)bundleURL); - - int status = EXIT_FAILURE; - NSError* error = nil; - Boolean loaded = CFBundleLoadExecutableAndReturnError(_handle, (CFErrorRef*)&error); - if(error != nil || !loaded) - { - print([[error description] UTF8String]); - completed(status); - return; - } - - void* sym = dlsym(_handle, "dllTestShutdown"); - sym = CFBundleGetFunctionPointerForName(_handle, CFSTR("dllTestShutdown")); - if(sym == 0) - { - NSString* err = [NSString stringWithFormat:@"Could not get function pointer dllTestShutdown from bundle %@", - bundlePath]; - print([err UTF8String]); - completed(status); - return; - } - _dllTestShutdown = (SHUTDOWN_ENTRY_POINT)sym; - - sym = CFBundleGetFunctionPointerForName(_handle, CFSTR("dllMain")); - if(sym == 0) - { - NSString* err = [NSString stringWithFormat:@"Could not get function pointer dllMain from bundle %@", - bundlePath]; - print([err UTF8String]); - completed(status); - return; - } - - MAIN_ENTRY_POINT dllMain = (MAIN_ENTRY_POINT)sym; - - std::vector<std::string> args; - if(_type == TestTypeServer) - { - args.push_back("server"); - } - else - { - args.push_back("client"); - } - args.push_back("--Ice.NullHandleAbort=1"); - args.push_back("--Ice.Warn.Connections=1"); - args.push_back("--Ice.Default.Host=127.0.0.1"); - args.push_back("--Ice.Trace.Network=0"); - args.push_back("--Ice.Trace.Protocol=0"); - - if(_type == TestTypeServer) - { - args.push_back("--Ice.ThreadPool.Server.Size=1"); - args.push_back("--Ice.ThreadPool.Server.SizeMax=3"); - args.push_back("--Ice.ThreadPool.Server.SizeWarn=0"); - //args.push_back("--Ice.PrintAdapterReady=1"); - args.push_back("--Ice.ServerIdleTime=30"); - } - - args.push_back("--Ice.Default.Protocol=" + _config.protocol); - if(_config.protocol == "ssl" || _config.protocol == "wss") - { - args.push_back("--IceSSL.CAs=cacert.der"); - args.push_back("--IceSSL.CheckCertName=0"); - if(_type == TestTypeServer) - { - args.push_back("--IceSSL.CertFile=server.p12"); - } - else - { - args.push_back("--IceSSL.CertFile=client.p12"); - } - args.push_back("--IceSSL.Password=password"); - args.push_back("--Ice.Override.ConnectTimeout=10000"); // COMPILERFIX: Workaround for SSL hang on iOS devices - } - copy(_config.args.begin(), _config.args.end(), back_inserter(args)); - - char** argv = new char*[args.size() + 1]; - for(unsigned int i = 0; i < args.size(); ++i) - { - argv[i] = const_cast<char*>(args[i].c_str()); - } - argv[args.size()] = 0; - try - { - status = dllMain(static_cast<int>(args.size()), argv, this); - } - catch(const std::exception& ex) - { - print("unexpected exception while running `" + args[0] + "':\n" + ex.what()); - } - catch(...) - { - print("unexpected unknown exception while running `" + args[0] + "'"); - } - completed(status); - delete[] argv; -} - -void -MainHelperI::serverReady() -{ - [_target performSelectorOnMainThread:_ready withObject:nil waitUntilDone:NO]; -} - -void -MainHelperI::shutdown() -{ - if(_dllTestShutdown) - { - _dllTestShutdown(); - } -} - -bool -MainHelperI::redirect() -{ - return _type == TestTypeClient; -} - -void -MainHelperI::print(const std::string& msg) -{ - [_target performSelectorOnMainThread:_output - withObject:[NSString stringWithUTF8String: msg.c_str()] - waitUntilDone:NO]; -} diff --git a/cpp/test/ios/testSuiteApp/Classes/TestViewController.h b/cpp/test/ios/testSuiteApp/Classes/TestViewController.h deleted file mode 100644 index 91d4a3408d2..00000000000 --- a/cpp/test/ios/testSuiteApp/Classes/TestViewController.h +++ /dev/null @@ -1,30 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#import <UIKit/UIKit.h> -#import <TestUtil.h> - -@interface TestViewController : UIViewController<UITableViewDataSource, UITableViewDelegate> -{ -@private - IBOutlet UITableView* output; - IBOutlet UIActivityIndicatorView* activity; - IBOutlet UIButton* nextButton; - - NSMutableString* currentMessage; - NSMutableArray* messages; - NSOperationQueue* queue; - TestSuite* testSuite; - NSEnumerator* testRunEnumator; - bool reloadScheduled; -} --(IBAction)next:(id)sender; --(NSOperationQueue*) queue; -@end - diff --git a/cpp/test/ios/testSuiteApp/Classes/TestViewController.mm b/cpp/test/ios/testSuiteApp/Classes/TestViewController.mm deleted file mode 100644 index cddf3eaf59d..00000000000 --- a/cpp/test/ios/testSuiteApp/Classes/TestViewController.mm +++ /dev/null @@ -1,523 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#import <TestViewController.h> -#import <TestUtil.h> -#import <AppDelegate.h> - -NSArray* noSSL = @[ @"Ice/metrics" ]; -NSArray* noWS = @[ @"Ice/metrics" ]; -NSArray* noCpp11 = @[ @"Ice/custom" ]; - -static NSArray* protocols = @[ @"tcp", @"ssl", @"ws", @"wss" ]; -// -// Avoid warning for undocumented method. -// -@interface UIApplication(UndocumentedAPI) --(void)launchApplicationWithIdentifier:(NSString*)id suspended:(BOOL)flag; -@end - -// TODO: Would be nice to have a red font for fatal, and error messages. -@interface MessageCell : UITableViewCell -{ -@private - UILabel* body; -} - -@property (nonatomic, retain) UILabel* body; - -+(CGFloat)heightForMessage:(NSString*)messsage; - -@end - -@implementation MessageCell -@synthesize body; - -- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier -{ - if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) - { - body = [[UILabel alloc] initWithFrame:CGRectZero]; - body.textColor = [UIColor blackColor]; - body.font = [UIFont boldSystemFontOfSize:14]; - body.numberOfLines = 0; - - [self.contentView addSubview:self.body]; - } - - return self; -} - -+(CGFloat)heightForMessage:(NSString*)text -{ - // The header is always one line, the body is multiple lines. - // The width of the table is 320 - 20px of left & right padding. We don't want to let the body - // text go past 200px. - CGRect body = [text boundingRectWithSize:CGSizeMake(300.f, 200.0f) options:NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:[UIFont boldSystemFontOfSize:14] } context:nil]; - return body.size.height + 20.f; -} - -- (void)layoutSubviews -{ - [super layoutSubviews]; - - CGRect contentRect = self.contentView.bounds; - - CGRect bodyFrame = CGRectMake(10.f, 0.f, CGRectGetWidth(contentRect)-20.f, CGRectGetHeight(contentRect)); - - self.body.frame = bodyFrame; -} - -- (void)dealloc -{ - [body release]; - [super dealloc]; -} - --(void)setMessage:(NSString*)m -{ - self.body.text = m; -} - -@end - -@interface TestViewController() - -@property (nonatomic, retain) UITableView* output; -@property (nonatomic, retain) UIActivityIndicatorView* activity; -@property (nonatomic, retain) UIButton* nextButton; - -@property (nonatomic, retain) NSMutableString* currentMessage; -@property (nonatomic, retain) NSMutableArray* messages; -@property (nonatomic, retain) NSOperationQueue* queue; -@property (retain) TestSuite* testSuite; - --(void)add:(NSString*)d; --(void)startTest; -@end - -@interface TestRun : NSObject -{ - NSString* testSuiteId; - TestCase* testCase; - NSString* protocol; - int completed; - int running; - int error; - MainHelperI* clientHelper; - MainHelperI* serverHelper; - TestViewController* viewController; -} - -+(id) testRun:(NSString*)testSuiteId testCase:(TestCase*)testCase protocol:(NSString*)protocol; - --(NSInvocationOperation*) runInvocation:(TestViewController*)callback; -@end - -@implementation TestViewController - -@synthesize output; -@synthesize activity; -@synthesize nextButton; -@synthesize currentMessage; -@synthesize messages; -@synthesize queue; -@synthesize testSuite; - -- (void)viewDidLoad -{ - self.currentMessage = [NSMutableString string]; - self.messages = [NSMutableArray array]; - queue = [[NSOperationQueue alloc] init]; - self.queue.maxConcurrentOperationCount = 2; // We need at least 2 concurrent operations. - - [super viewDidLoad]; -} - --(void)viewWillAppear:(BOOL)animated -{ - AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate]; - self.testSuite = (TestSuite*)[appDelegate.testSuites objectAtIndex:appDelegate.currentTestSuite]; - [self startTest]; -} - --(void)viewWillDisappear:(BOOL)animated -{ - // TODO: Waiting isn't possible until the tests periodically find out whether - // they should terminate. - // Wait until the tests are complete. - //[queue waitUntilAllOperationsAreFinished]; -} - -- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation -{ - // Return YES for supported orientations - return (interfaceOrientation == UIInterfaceOrientationPortrait); -} - -- (void)didReceiveMemoryWarning -{ - [super didReceiveMemoryWarning]; // Releases the view if it doesn't have a superview - // Release anything that's not essential, such as cached data -} - -- (void)dealloc -{ - [output release]; - [activity release]; - [nextButton release]; - - [currentMessage release]; - [messages release]; - [queue release]; - [testSuite release]; - - [super dealloc]; -} - -#pragma mark - - --(void)startTest -{ - self.title = testSuite.testSuiteId; - [self.navigationItem setHidesBackButton:YES animated:YES]; - - AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate]; - if(appDelegate.loop) - { - [nextButton setTitle:@"Stop running" forState:UIControlStateNormal]; - } - else - { - nextButton.enabled = NO; - [nextButton setAlpha:0.5]; - [nextButton setTitle:@"Test is running" forState:UIControlStateDisabled]; - } - - [currentMessage deleteCharactersInRange:NSMakeRange(0, currentMessage.length)]; - [messages removeAllObjects]; - [output reloadData]; - - [activity startAnimating]; -#ifdef ICE_CPP11_MAPPING - if([testSuite isIn:noCpp11]) - { - [self add:@"C++11 not supported by this test\n"]; - [self testComplete:YES]; - return; - } -#endif - if(([appDelegate.protocol isEqualToString:@"ws"] || [appDelegate.protocol isEqualToString:@"wss"]) && - [testSuite isIn:noWS]) - { - [self add:@"WS not supported by this test\n"]; - [self testComplete:YES]; - return; - } - if([appDelegate.protocol isEqualToString:@"ssl"] && - [testSuite isIn:noSSL]) - { - [self add:@"SSL not supported by this test\n"]; - [self testComplete:YES]; - return; - } - - NSMutableArray* testRuns = [NSMutableArray array]; - for(id testCase in testSuite.testCases) - { - [testRuns addObject:[TestRun testRun:testSuite.testSuiteId testCase:testCase protocol:appDelegate.protocol]]; - } - testRunEnumator = [[testRuns objectEnumerator] retain]; - id testRun = [testRunEnumator nextObject]; - [queue addOperation:[testRun runInvocation:self]]; -} --(void)testRunComplete:(BOOL)success -{ - if(!success) - { - [self testComplete:NO]; - return; - } - - id testRun = [testRunEnumator nextObject]; - if(testRun == nil) - { - [self testComplete:YES]; - } - else - { - [queue addOperation:[testRun runInvocation:self]]; - } -} - --(void)testComplete:(BOOL)success -{ - [activity stopAnimating]; - - nextButton.enabled = YES; - [nextButton setAlpha:1.0]; - [self.navigationItem setHidesBackButton:NO animated:YES]; - - AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate]; - NSInteger next = (appDelegate.currentTestSuite + 1) % (appDelegate.testSuites.count); - TestSuite* nextTestSuite = (TestSuite*)[appDelegate.testSuites objectAtIndex:next]; - NSString* buttonTitle = [NSString stringWithFormat:@"Run %@", nextTestSuite.testSuiteId]; - [nextButton setTitle:buttonTitle forState:UIControlStateNormal]; - self.testSuite = nil; - [testRunEnumator release]; - testRunEnumator = nil; - - if([appDelegate testCompleted:success]) - { - NSAssert(self.testSuite == nil, @"testSuite == nil"); - self.testSuite = (TestSuite*)[appDelegate.testSuites objectAtIndex:appDelegate.currentTestSuite]; - [self startTest]; - } -} - --(IBAction)next:(id)sender -{ - AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate]; - if(appDelegate.loop) - { - appDelegate.loop = NO; - nextButton.enabled = NO; - [nextButton setAlpha:0.5]; - [nextButton setTitle:@"Waiting..." forState:UIControlStateDisabled]; - } - else - { - NSAssert(self.testSuite == nil, @"testSuite == nil"); - AppDelegate *appDelegate = (AppDelegate *)[[UIApplication sharedApplication] delegate]; - self.testSuite = (TestSuite*)[appDelegate.testSuites objectAtIndex:appDelegate.currentTestSuite]; - [self startTest]; - } -} --(NSOperationQueue*) queue -{ - return queue; -} --(void)add:(NSString*)s -{ - [currentMessage appendString:s]; - NSRange range = [currentMessage rangeOfString:@"\n" options:NSBackwardsSearch]; - if(range.location != NSNotFound) - { - [messages addObject:[[currentMessage copy] autorelease]]; - [currentMessage deleteCharactersInRange:NSMakeRange(0, currentMessage.length)]; - - // reloadData hangs if called too rapidly... we call at most every 100ms. - if(!reloadScheduled) - { - reloadScheduled = TRUE; - [self performSelector:@selector(reloadOutput) withObject:nil afterDelay:0.1]; - } - } -} --(void) reloadOutput -{ - reloadScheduled = FALSE; - [output reloadData]; - - if(messages.count == 0) - { - return; - } - - NSUInteger path[] = {0, messages.count -1}; - [output scrollToRowAtIndexPath:[NSIndexPath indexPathWithIndexes:path length:2] - atScrollPosition:UITableViewScrollPositionBottom - animated:NO]; - -} - -#pragma mark <UITableViewDelegate, UITableViewDataSource> Methods - --(NSInteger)numberOfSectionsInTableView:(UITableView *)tv -{ - return 1; -} - --(NSInteger)tableView:(UITableView *)tv numberOfRowsInSection:(NSInteger)section -{ - return messages.count; -} - --(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath -{ - if([messages count] <= indexPath.row) - { - return [MessageCell heightForMessage:@""]; - } - return [MessageCell heightForMessage:[messages objectAtIndex:indexPath.row]]; -} - --(UITableViewCell *)tableView:(UITableView *)tv cellForRowAtIndexPath:(NSIndexPath *)indexPath -{ - MessageCell *cell = (MessageCell*)[output dequeueReusableCellWithIdentifier:@"MessageCell"]; - if(cell == nil) - { - cell = [[[MessageCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"MessageCell"] autorelease]; - } - [cell setMessage:[messages objectAtIndex:indexPath.row]]; - return cell; -} - --(NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath -{ - return nil; -} - -@end - -@implementation TestRun --(id) init:(NSString*)ts testCase:(TestCase*)tc protocol:(NSString*)p -{ - self = [super init]; - if(!self) - { - return nil; - } - self->testSuiteId = ts; - self->testCase = tc; - self->protocol = p; - self->completed = 0; - self->error = 0; - self->running = 0; - return self; -} -+(id) testRun:(NSString*)ts testCase:(TestCase*)tc protocol:(NSString*)p -{ - return [[[TestRun alloc] init:ts testCase:tc protocol:p] autorelease]; -} --(NSInvocationOperation*) runInvocation:(TestViewController*)ctl -{ - viewController = ctl; - return [[[NSInvocationOperation alloc] initWithTarget:self selector:@selector(run) object:nil] autorelease]; -} --(void)run -{ -// [self add:[NSString stringWithFormat:@"[ running %@ ]\n", testCase.name]]; - if(testCase.server) - { - [self runServer]; - } - else - { - [self runClient]; - } -} --(void)add:(NSString*)s -{ - [viewController add:s]; -} - --(void)clientComplete:(NSNumber*)rc -{ - if(clientHelper) - { - delete clientHelper; - clientHelper = 0; - } - - if([rc intValue] != 0) - { - [viewController add:[NSString stringWithFormat:@"client error: %@!\n", rc]]; - if(serverHelper) - { - serverHelper->shutdown(); - } - ++error; - } - - completed++; - if(!testCase.server || completed == 2) - { - [viewController testRunComplete:error == 0]; - } -} - -// Run in a separate thread. --(void)runClient -{ - running++; - - std::string name = [testCase.name UTF8String]; - std::string prefix = std::string("test/") + [testSuiteId UTF8String]; - replace(prefix.begin(), prefix.end(), '/', '_'); - std::string clt = [testCase.client UTF8String]; - - TestConfig config; - config.protocol = [protocol UTF8String]; - for(id arg in testCase.args) - { - config.args.push_back([arg UTF8String]); - } - - clientHelper = new MainHelperI(name, prefix + "/" + clt, TestTypeClient, config, - self, @selector(add:), @selector(serverReady)); - clientHelper->run(); - int rc = clientHelper->status(); - [self performSelectorOnMainThread:@selector(clientComplete:) withObject:[NSNumber numberWithInt:rc] waitUntilDone:NO]; -} - --(void)serverComplete:(NSNumber*)rc -{ - if(serverHelper) - { - delete serverHelper; - serverHelper = 0; - } - - if([rc intValue] != 0) - { - [viewController add:[NSString stringWithFormat:@"server error: %@!\n", rc]]; - ++error; - } - completed++; - if(completed == 2) - { - [viewController testRunComplete:error == 0]; - } -} - -// Run in a separate thread. --(void)runServer -{ - running++; - - std::string name = [testCase.name UTF8String]; - std::string prefix = std::string("test/") + [testSuiteId UTF8String]; - replace(prefix.begin(), prefix.end(), '/', '_'); - std::string srv = [testCase.server UTF8String]; - - TestConfig config; - config.protocol = [protocol UTF8String]; - for(id arg in testCase.args) - { - config.args.push_back([arg UTF8String]); - } - - serverHelper = new MainHelperI(name, prefix + "/" + srv, TestTypeServer, config, - self, @selector(add:), @selector(serverReady)); - serverHelper->run(); - int rc = serverHelper->status(); - [self performSelectorOnMainThread:@selector(serverComplete:) withObject:[NSNumber numberWithInt:rc] waitUntilDone:NO]; -} - -// Kick off the client. --(void)serverReady -{ - [[viewController queue] addOperation:[[[NSInvocationOperation alloc] - initWithTarget:self - selector:@selector(runClient) - object:nil] autorelease]]; -} - -@end diff --git a/cpp/test/ios/testSuiteApp/Default-568h@2x.png b/cpp/test/ios/testSuiteApp/Default-568h@2x.png Binary files differdeleted file mode 100644 index 0891b7aabfc..00000000000 --- a/cpp/test/ios/testSuiteApp/Default-568h@2x.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/Contents.json b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 5a94148ba69..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "test_suite-Small@2x-1.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "test_suite-Small@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "test_suite-Small-40@2x-1.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "test_suite-Small-40@3x.png", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "test_suite-Small-40@3x-1.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "New icon-60@3x.png", - "scale" : "3x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "test_suite-Small.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "test_suite-Small@2x-2.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "test_suite-Small-40.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "test_suite-Small-40@2x-2.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "test_suite-76.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "test_suite-76@2x.png", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "83.5x83.5", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -}
\ No newline at end of file diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/New icon-60@3x.png b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/New icon-60@3x.png Binary files differdeleted file mode 100644 index a37f851e642..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/New icon-60@3x.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-76.png b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-76.png Binary files differdeleted file mode 100644 index 2855a8b674b..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-76.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-76@2x.png b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-76@2x.png Binary files differdeleted file mode 100644 index 29047dc5a52..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-76@2x.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40.png b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40.png Binary files differdeleted file mode 100644 index e76086fb3d6..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40@2x-1.png b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40@2x-1.png Binary files differdeleted file mode 100644 index 7615d3255bc..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40@2x-1.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40@2x-2.png b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40@2x-2.png Binary files differdeleted file mode 100644 index 7615d3255bc..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40@2x-2.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40@3x-1.png b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40@3x-1.png Binary files differdeleted file mode 100644 index f04f442176a..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40@3x-1.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40@3x.png b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40@3x.png Binary files differdeleted file mode 100644 index f04f442176a..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small-40@3x.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small.png b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small.png Binary files differdeleted file mode 100644 index d57695edc28..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small@2x-1.png b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small@2x-1.png Binary files differdeleted file mode 100644 index 79edc547e2c..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small@2x-1.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small@2x-2.png b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small@2x-2.png Binary files differdeleted file mode 100644 index 79edc547e2c..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small@2x-2.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small@3x.png b/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small@3x.png Binary files differdeleted file mode 100644 index 49cdc033096..00000000000 --- a/cpp/test/ios/testSuiteApp/Images.xcassets/AppIcon.appiconset/test_suite-Small@3x.png +++ /dev/null diff --git a/cpp/test/ios/testSuiteApp/MainWindow-iPad.xib b/cpp/test/ios/testSuiteApp/MainWindow-iPad.xib deleted file mode 100644 index 1313995e567..00000000000 --- a/cpp/test/ios/testSuiteApp/MainWindow-iPad.xib +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none"> - <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/> - </dependencies> - <objects> - <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIApplication"> - <connections> - <outlet property="delegate" destination="3" id="4"/> - </connections> - </placeholder> - <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <customObject id="3" userLabel="container App Delegate" customClass="AppDelegate"> - <connections> - <outlet property="navigationController" destination="17" id="21"/> - <outlet property="window" destination="12" id="14"/> - </connections> - </customObject> - <navigationController id="17"> - <extendedEdge key="edgesForExtendedLayout"/> - <navigationBar key="navigationBar" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="19"> - <autoresizingMask key="autoresizingMask"/> - <animations/> - </navigationBar> - <viewControllers> - <viewController nibName="TestSelect-iPad" id="18" customClass="TestSelectController"> - <extendedEdge key="edgesForExtendedLayout"/> - <navigationItem key="navigationItem" title="Ice Test Suite" id="20"/> - </viewController> - </viewControllers> - <metadata/> - </navigationController> - <window opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="12"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> - <metadata/> - </window> - </objects> -</document> diff --git a/cpp/test/ios/testSuiteApp/MainWindow.xib b/cpp/test/ios/testSuiteApp/MainWindow.xib deleted file mode 100644 index 330ffa0c297..00000000000 --- a/cpp/test/ios/testSuiteApp/MainWindow.xib +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES"> - <device id="retina4_7" orientation="portrait"> - <adaptation id="fullscreen"/> - </device> - <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/> - <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> - </dependencies> - <objects> - <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIApplication"> - <connections> - <outlet property="delegate" destination="3" id="4"/> - </connections> - </placeholder> - <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <customObject id="3" userLabel="container App Delegate" customClass="AppDelegate"> - <connections> - <outlet property="navigationController" destination="17" id="21"/> - <outlet property="window" destination="12" id="14"/> - </connections> - </customObject> - <window opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="12"> - <rect key="frame" x="0.0" y="0.0" width="320" height="480"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> - <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> - </window> - <navigationController id="17"> - <extendedEdge key="edgesForExtendedLayout"/> - <navigationBar key="navigationBar" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="19"> - <rect key="frame" x="0.0" y="0.0" width="1000" height="1000"/> - <autoresizingMask key="autoresizingMask"/> - </navigationBar> - <viewControllers> - <viewController nibName="TestSelect" wantsFullScreenLayout="YES" id="18" customClass="TestSelectController"> - <extendedEdge key="edgesForExtendedLayout"/> - <navigationItem key="navigationItem" title="Ice C++ Test Suite" id="20"/> - </viewController> - </viewControllers> - </navigationController> - </objects> - <simulatedMetricsContainer key="defaultSimulatedMetrics"> - <simulatedStatusBarMetrics key="statusBar"/> - <simulatedOrientationMetrics key="orientation"/> - <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/> - </simulatedMetricsContainer> -</document> diff --git a/cpp/test/ios/testSuiteApp/README.md b/cpp/test/ios/testSuiteApp/README.md deleted file mode 100644 index 356e1e407c9..00000000000 --- a/cpp/test/ios/testSuiteApp/README.md +++ /dev/null @@ -1 +0,0 @@ -This project builds the iOS C++ Test Suite application for running tests with the iOS simulator or on an iOS device. diff --git a/cpp/test/ios/testSuiteApp/TestSelect-iPad.xib b/cpp/test/ios/testSuiteApp/TestSelect-iPad.xib deleted file mode 100644 index 77817e380d6..00000000000 --- a/cpp/test/ios/testSuiteApp/TestSelect-iPad.xib +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none"> - <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/> - </dependencies> - <objects> - <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TestSelectController"> - <connections> - <outlet property="loopSwitch" destination="13" id="15"/> - <outlet property="pickerView" destination="3" id="9"/> - <outlet property="protocol" destination="18" id="19"/> - <outlet property="view" destination="1" id="8"/> - </connections> - </placeholder> - <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="1"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <subviews> - <pickerView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="3"> - <rect key="frame" x="20" y="20" width="728" height="216"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - <connections> - <outlet property="dataSource" destination="-1" id="5"/> - <outlet property="delegate" destination="-1" id="6"/> - </connections> - </pickerView> - <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="4"> - <rect key="frame" x="326" y="373" width="117" height="37"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/> - <state key="normal" title="Execute Test"> - <color key="titleShadowColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="disabled" title="Execute Test"/> - <state key="selected" title="Execute Test"/> - <state key="highlighted" title="Execute Test"> - <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - </state> - <connections> - <action selector="runTest:" destination="-1" eventType="touchUpInside" id="7"/> - </connections> - </button> - <switch opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="13"> - <rect key="frame" x="381" y="321" width="51" height="31"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - </switch> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" text="Loop" lineBreakMode="tailTruncation" minimumFontSize="10" id="14"> - <rect key="frame" x="310" y="324" width="42" height="21"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - <fontDescription key="fontDescription" type="system" pointSize="17"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <nil key="highlightedColor"/> - </label> - <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" id="18"> - <rect key="frame" x="279" y="256" width="210" height="29"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - <segments> - <segment title="TCP"/> - <segment title="SSL"/> - <segment title="WS"/> - <segment title="WSS"/> - </segments> - </segmentedControl> - </subviews> - <animations/> - <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> - <nil key="simulatedStatusBarMetrics"/> - </view> - </objects> -</document> diff --git a/cpp/test/ios/testSuiteApp/TestSelect.xib b/cpp/test/ios/testSuiteApp/TestSelect.xib deleted file mode 100644 index 1db89250692..00000000000 --- a/cpp/test/ios/testSuiteApp/TestSelect.xib +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none"> - <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/> - </dependencies> - <objects> - <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TestSelectController"> - <connections> - <outlet property="loopSwitch" destination="13" id="15"/> - <outlet property="pickerView" destination="3" id="9"/> - <outlet property="protocol" destination="16" id="18"/> - <outlet property="view" destination="1" id="19"/> - </connections> - </placeholder> - <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view contentMode="scaleToFill" id="1"> - <rect key="frame" x="0.0" y="0.0" width="320" height="480"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <subviews> - <pickerView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="3"> - <rect key="frame" x="-1" y="0.0" width="320" height="216"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - <connections> - <outlet property="dataSource" destination="-1" id="5"/> - <outlet property="delegate" destination="-1" id="6"/> - </connections> - </pickerView> - <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="4"> - <rect key="frame" x="100" y="368" width="117" height="37"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/> - <state key="normal" title="Execute Test"> - <color key="titleShadowColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="disabled" title="Execute Test"/> - <state key="selected" title="Execute Test"/> - <state key="highlighted" title="Execute Test"> - <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - </state> - <connections> - <action selector="runTest:" destination="-1" eventType="touchUpInside" id="7"/> - </connections> - </button> - <switch opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="13"> - <rect key="frame" x="154" y="293" width="51" height="31"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - </switch> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" text="Loop" lineBreakMode="tailTruncation" minimumFontSize="10" id="14"> - <rect key="frame" x="83" y="296" width="42" height="21"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - <fontDescription key="fontDescription" type="system" pointSize="17"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> - <nil key="highlightedColor"/> - </label> - <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" id="16"> - <rect key="frame" x="53" y="233" width="210" height="29"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> - <animations/> - <segments> - <segment title="TCP"/> - <segment title="SSL"/> - <segment title="WS"/> - <segment title="WSS"/> - </segments> - </segmentedControl> - </subviews> - <animations/> - <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> - <nil key="simulatedStatusBarMetrics"/> - <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> - </view> - </objects> -</document> diff --git a/cpp/test/ios/testSuiteApp/TestView-iPad.xib b/cpp/test/ios/testSuiteApp/TestView-iPad.xib deleted file mode 100644 index 309191a0c2a..00000000000 --- a/cpp/test/ios/testSuiteApp/TestView-iPad.xib +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none"> - <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/> - </dependencies> - <objects> - <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TestViewController"> - <connections> - <outlet property="activity" destination="16" id="18"/> - <outlet property="nextButton" destination="17" id="20"/> - <outlet property="output" destination="9" id="12"/> - <outlet property="view" destination="6" id="8"/> - </connections> - </placeholder> - <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="6"> - <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <tableView opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" bouncesZoom="NO" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="27" sectionFooterHeight="27" id="9"> - <rect key="frame" x="20" y="20" width="728" height="939"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <animations/> - <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <connections> - <outlet property="dataSource" destination="-1" id="10"/> - <outlet property="delegate" destination="-1" id="11"/> - </connections> - </tableView> - <activityIndicatorView hidden="YES" opaque="NO" clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" hidesWhenStopped="YES" style="whiteLarge" id="16"> - <rect key="frame" x="246" y="967" width="37" height="37"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <animations/> - </activityIndicatorView> - <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="17"> - <rect key="frame" x="20" y="967" width="214" height="37"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <animations/> - <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/> - <state key="normal" title="Launch Next Test"> - <color key="titleShadowColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="disabled" title="Launch Next Test"/> - <state key="selected" title="Launch Next Test"/> - <state key="highlighted" title="Launch Next Test"> - <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - </state> - <connections> - <action selector="next:" destination="-1" eventType="touchUpInside" id="21"/> - </connections> - </button> - </subviews> - <animations/> - <color key="backgroundColor" white="0.75" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> - <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/> - </view> - </objects> -</document> diff --git a/cpp/test/ios/testSuiteApp/TestView.xib b/cpp/test/ios/testSuiteApp/TestView.xib deleted file mode 100644 index affe669bf13..00000000000 --- a/cpp/test/ios/testSuiteApp/TestView.xib +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none"> - <dependencies> - <deployment identifier="iOS"/> - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/> - </dependencies> - <objects> - <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TestViewController"> - <connections> - <outlet property="activity" destination="16" id="18"/> - <outlet property="nextButton" destination="17" id="20"/> - <outlet property="output" destination="9" id="12"/> - <outlet property="view" destination="6" id="8"/> - </connections> - </placeholder> - <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> - <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="6"> - <rect key="frame" x="0.0" y="0.0" width="320" height="460"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <subviews> - <tableView opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" bouncesZoom="NO" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="27" sectionFooterHeight="27" id="9"> - <rect key="frame" x="0.0" y="0.0" width="320" height="395"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> - <animations/> - <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - <connections> - <outlet property="dataSource" destination="-1" id="10"/> - <outlet property="delegate" destination="-1" id="11"/> - </connections> - </tableView> - <activityIndicatorView hidden="YES" opaque="NO" clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" hidesWhenStopped="YES" style="whiteLarge" id="16"> - <rect key="frame" x="242" y="408" width="37" height="37"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <animations/> - </activityIndicatorView> - <button opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="17"> - <rect key="frame" x="20" y="409" width="214" height="37"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/> - <animations/> - <fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/> - <state key="normal" title="Launch Next Test"> - <color key="titleShadowColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/> - </state> - <state key="disabled" title="Launch Next Test"/> - <state key="selected" title="Launch Next Test"/> - <state key="highlighted" title="Launch Next Test"> - <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> - </state> - <connections> - <action selector="next:" destination="-1" eventType="touchUpInside" id="21"/> - </connections> - </button> - </subviews> - <animations/> - <color key="backgroundColor" white="0.75" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> - <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> - </view> - </objects> -</document> diff --git a/cpp/test/ios/testSuiteApp/main.m b/cpp/test/ios/testSuiteApp/main.m deleted file mode 100644 index b2e21f0af1f..00000000000 --- a/cpp/test/ios/testSuiteApp/main.m +++ /dev/null @@ -1,17 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#import <UIKit/UIKit.h> - -int main(int argc, char *argv[]) { - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, nil); - [pool release]; - return retVal; -} |
