From b6b0692187d2a73fb13302446eb0870c15d480de Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 10:20:20 -0700 Subject: [PATCH 01/20] swtich from SenTestingKit to XCTest --- DAVKit.xcodeproj/project.pbxproj | 18 ++--- .../xcshareddata/DAVKit.xccheckout | 65 +++++++++++++++++++ Sources/Tests/BasicTests.m | 44 ++++++------- Sources/Tests/DAVTest.h | 2 +- Sources/Tests/DAVTest.m | 14 ++-- 5 files changed, 101 insertions(+), 42 deletions(-) create mode 100644 DAVKit.xcworkspace/xcshareddata/DAVKit.xccheckout diff --git a/DAVKit.xcodeproj/project.pbxproj b/DAVKit.xcodeproj/project.pbxproj index a9daee5..6bc5e28 100644 --- a/DAVKit.xcodeproj/project.pbxproj +++ b/DAVKit.xcodeproj/project.pbxproj @@ -211,7 +211,7 @@ C9FED5B2121D98D600DD1DFF /* BasicTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BasicTests.m; path = Sources/Tests/BasicTests.m; sourceTree = ""; }; C9FED5B7121D98D600DD1DFF /* DAVTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DAVTest.h; path = Sources/Tests/DAVTest.h; sourceTree = ""; }; C9FED5B8121D98D600DD1DFF /* DAVTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DAVTest.m; path = Sources/Tests/DAVTest.m; sourceTree = ""; }; - C9FF77EC121C6F51001250C7 /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; + C9FF77EC121C6F51001250C7 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; C9FF77ED121C6F51001250C7 /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = ""; }; F94970EB132A093600713958 /* NSDateRFC1123.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSDateRFC1123.h; sourceTree = ""; }; F94970EC132A093600713958 /* NSDateRFC1123.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSDateRFC1123.m; sourceTree = ""; }; @@ -262,7 +262,7 @@ isa = PBXGroup; children = ( 8DC2EF5B0486A6940098B216 /* DAVKit.framework */, - C9FF77EC121C6F51001250C7 /* Tests.octest */, + C9FF77EC121C6F51001250C7 /* Tests.xctest */, 5FEEF26016CE830C002C1CBF /* libDAVKit.a */, 221F8BA817259BFF004E7B9D /* Tests iOS.octest */, ); @@ -603,8 +603,8 @@ ); name = "Tests OS X"; productName = Tests; - productReference = C9FF77EC121C6F51001250C7 /* Tests.octest */; - productType = "com.apple.product-type.bundle"; + productReference = C9FF77EC121C6F51001250C7 /* Tests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -979,7 +979,7 @@ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; @@ -991,11 +991,8 @@ OTHER_LDFLAGS = ( "-framework", Cocoa, - "-framework", - SenTestingKit, ); PRODUCT_NAME = Tests; - WRAPPER_EXTENSION = octest; }; name = Debug; }; @@ -1007,7 +1004,7 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1017,11 +1014,8 @@ OTHER_LDFLAGS = ( "-framework", Cocoa, - "-framework", - SenTestingKit, ); PRODUCT_NAME = Tests; - WRAPPER_EXTENSION = octest; ZERO_LINK = NO; }; name = Release; diff --git a/DAVKit.xcworkspace/xcshareddata/DAVKit.xccheckout b/DAVKit.xcworkspace/xcshareddata/DAVKit.xccheckout new file mode 100644 index 0000000..c16d7b5 --- /dev/null +++ b/DAVKit.xcworkspace/xcshareddata/DAVKit.xccheckout @@ -0,0 +1,65 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + E2E9C605-950B-4CF2-B3F5-C7075C5E7A99 + IDESourceControlProjectName + DAVKit + IDESourceControlProjectOriginsDictionary + + 6FC454DF-E2BB-4398-B7EE-54CB5CC085E8 + https://github.com/karelia/DAVKit.git + 863EF849-9A53-40C2-8298-F48FCC65C254 + https://github.com/karelia/MockServer.git + DE6DA146-0F19-4BB2-84ED-FEB5D1DBB7E0 + https://github.com/boredzo/iso-8601-date-formatter.git + + IDESourceControlProjectPath + DAVKit.xcworkspace + IDESourceControlProjectRelativeInstallPathDictionary + + 6FC454DF-E2BB-4398-B7EE-54CB5CC085E8 + .. + 863EF849-9A53-40C2-8298-F48FCC65C254 + ../Tests/MockServer + DE6DA146-0F19-4BB2-84ED-FEB5D1DBB7E0 + ../Sources/iso-8601-date-formatter + + IDESourceControlProjectURL + https://github.com/karelia/DAVKit.git + IDESourceControlProjectVersion + 110 + IDESourceControlProjectWCCIdentifier + 6FC454DF-E2BB-4398-B7EE-54CB5CC085E8 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 6FC454DF-E2BB-4398-B7EE-54CB5CC085E8 + IDESourceControlWCCName + DAVKit + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + DE6DA146-0F19-4BB2-84ED-FEB5D1DBB7E0 + IDESourceControlWCCName + iso-8601-date-formatter + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + 863EF849-9A53-40C2-8298-F48FCC65C254 + IDESourceControlWCCName + MockServer + + + + diff --git a/Sources/Tests/BasicTests.m b/Sources/Tests/BasicTests.m index 1851701..7686f9e 100644 --- a/Sources/Tests/BasicTests.m +++ b/Sources/Tests/BasicTests.m @@ -144,15 +144,15 @@ - (void)testKMCOL { [self makeTestDirectory]; // did we get an error? - STAssertNil(self.error, @"unexpected error for MKCOL %@", self.error); - STAssertNil(self.result, @"unexpected result for MKCOL %@", self.result); + XCTAssertNil(self.error, @"unexpected error for MKCOL %@", self.error); + XCTAssertNil(self.result, @"unexpected result for MKCOL %@", self.result); // try to make the directory again - we should get back a 405, which we ignore [self useResponseSet:@"make fails"]; [self makeTestDirectory]; - STAssertTrue(self.error.code == 405, @"unexpected error for MKCOL %@", self.error); - STAssertNil(self.result, @"unexpected result for MKCOL %@", self.result); + XCTAssertTrue(self.error.code == 405, @"unexpected error for MKCOL %@", self.error); + XCTAssertNil(self.result, @"unexpected result for MKCOL %@", self.result); [self removeTestDirectory]; } @@ -166,8 +166,8 @@ - (void)testPUT { [self makeTestFile]; - STAssertNil(self.error, @"Unexpected error for PUT %@", self.error); - STAssertNil(self.result, @"Unexpected result for PUT %@", self.result); + XCTAssertNil(self.error, @"Unexpected error for PUT %@", self.error); + XCTAssertNil(self.result, @"Unexpected result for PUT %@", self.result); [self removeTestDirectory]; } @@ -183,9 +183,9 @@ - (void)testGET { self.server.data = [self testData]; [self queueAndWaitForRequest:req]; - STAssertNil(self.error, @"Unexpected error for GET %@", self.error); - STAssertTrue([self.result isKindOfClass:[NSData class]], @"Expecting a NSData object for GET requests"); - STAssertTrue([self.result length] == [self.testText length], @"Invalid length (string should be %@)", self.testText); + XCTAssertNil(self.error, @"Unexpected error for GET %@", self.error); + XCTAssertTrue([self.result isKindOfClass:[NSData class]], @"Expecting a NSData object for GET requests"); + XCTAssertTrue([self.result length] == [self.testText length], @"Invalid length (string should be %@)", self.testText); [self removeTestDirectory]; } @@ -202,8 +202,8 @@ - (void)testCOPY { req.overwrite = YES; [self queueAndWaitForRequest:req]; - STAssertNil(self.error, @"Unexpected error for COPY %@", self.error); - STAssertNil(self.result, @"Unexpected result for COPY %@", self.result); + XCTAssertNil(self.error, @"Unexpected error for COPY %@", self.error); + XCTAssertNil(self.result, @"Unexpected result for COPY %@", self.result); [self removeTestDirectory]; } @@ -219,8 +219,8 @@ - (void)testMOVE { req.destinationPath = [self fullPathForPath:@"davkittest/filetest24.txt"]; [self queueAndWaitForRequest:req]; - STAssertNil(self.error, @"Unexpected error for MOVE %@", self.error); - STAssertNil(self.result, @"Unexpected result for MOVE %@", self.result); + XCTAssertNil(self.error, @"Unexpected error for MOVE %@", self.error); + XCTAssertNil(self.result, @"Unexpected result for MOVE %@", self.result); [self removeTestDirectory]; } @@ -249,9 +249,9 @@ - (void)testPROPFIND { self.server.data = [self emptyDirectoryListingData]; [self queueAndWaitForRequest:req]; - STAssertNil(self.error, @"Unexpected error for PROPFIND %@", self.error); - STAssertTrue([self.result isKindOfClass:[NSArray class]], @"Expecting a NSArray object for PROPFIND requests"); - STAssertEquals([self.result count], 1UL, @"Unexpected result count %lu %@", [self.result count], self.result); + XCTAssertNil(self.error, @"Unexpected error for PROPFIND %@", self.error); + XCTAssertTrue([self.result isKindOfClass:[NSArray class]], @"Expecting a NSArray object for PROPFIND requests"); + XCTAssertEqual([self.result count], 1UL, @"Unexpected result count %lu %@", [self.result count], self.result); NSString* path1 = @"davkittest/filetest22.txt"; NSString* path2 = @"davkittest/filetest23.txt"; @@ -265,16 +265,16 @@ - (void)testPROPFIND { self.server.data = [self directoryListingData]; [self queueAndWaitForRequest:req2]; - STAssertNil(self.error, @"Unexpected error for PROPFIND %@", self.error); - STAssertTrue([self.result isKindOfClass:[NSArray class]], @"Expecting a NSArray object for PROPFIND requests"); - STAssertEquals([self.result count], 4UL, @"Unexpected result count %lu %@", [self.result count], self.result); + XCTAssertNil(self.error, @"Unexpected error for PROPFIND %@", self.error); + XCTAssertTrue([self.result isKindOfClass:[NSArray class]], @"Expecting a NSArray object for PROPFIND requests"); + XCTAssertEqual([self.result count], 4UL, @"Unexpected result count %lu %@", [self.result count], self.result); NSUInteger n = 0; NSArray* names = @[@"davkittest/", path1, path2, path3]; for (DAVResponseItem* item in self.result) { NSString* expected = [self fullPathForPath:names[n++]]; - STAssertTrue([self path:item.href matchesPath:expected], @"expected %@ got %@", expected, item.href); + XCTAssertTrue([self path:item.href matchesPath:expected], @"expected %@ got %@", expected, item.href); } [self removeTestDirectory]; @@ -287,8 +287,8 @@ - (void)testDELETE { [self makeTestDirectory]; [self removeTestDirectory]; - STAssertNil(self.error, @"Unexpected error for DELETE %@", self.error); - STAssertNil(self.result, @"Unexpected result for DELETE %@", self.result); + XCTAssertNil(self.error, @"Unexpected error for DELETE %@", self.error); + XCTAssertNil(self.result, @"Unexpected result for DELETE %@", self.result); } } diff --git a/Sources/Tests/DAVTest.h b/Sources/Tests/DAVTest.h index 37aff67..27a223d 100644 --- a/Sources/Tests/DAVTest.h +++ b/Sources/Tests/DAVTest.h @@ -5,7 +5,7 @@ // Copyright Matt Rajca 2010. All rights reserved. // -#import +#import #import #import "KMSTestCase.h" diff --git a/Sources/Tests/DAVTest.m b/Sources/Tests/DAVTest.m index 297c6f1..8533513 100644 --- a/Sources/Tests/DAVTest.m +++ b/Sources/Tests/DAVTest.m @@ -23,7 +23,7 @@ @implementation DAVTest - (void)setUp { // Use MockServer out of the box - [[NSUserDefaults standardUserDefaults] registerDefaults:@{ @"DAVTestURL" : @"Off" }]; + [[NSUserDefaults standardUserDefaults] registerDefaults:@{ @"DAVTestURL" : @"MockServer" }]; _done = NO; @@ -54,7 +54,7 @@ - (void)setUp { self.url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@%@", url.scheme, url.host, url.path]]; ok = self.url != nil; - STAssertNotNil(self.url, @"You need to set a test server address. Use the defaults command on the command line: defaults write otest DAVTestURL \"server-url-here\".\n\nNote that the iOS tests read from the otest.plist in ~/Library/Application Support/iPhone Simulator/Library/Preferences, so you'll need to edit that one manually."); + XCTAssertNotNil(self.url, @"You need to set a test server address. Use the defaults command on the command line: defaults write otest DAVTestURL \"server-url-here\".\n\nNote that the iOS tests read from the otest.plist in ~/Library/Application Support/iPhone Simulator/Library/Preferences, so you'll need to edit that one manually."); } if (ok) @@ -62,7 +62,7 @@ - (void)setUp { NSLog(@"Testing %@ as %@ %@", self.url, self.user, self.password); _session = [[DAVSession alloc] initWithRootURL:self.url delegate:self]; - STAssertNotNil(_session, @"Couldn't create DAV session"); + XCTAssertNotNil(_session, @"Couldn't create DAV session"); } } } @@ -138,7 +138,7 @@ - (id)requestOfClass:(Class)class withPath:(NSString *)path - (void)queueAndWaitForRequest:(DAVRequest*)request { - STAssertNotNil(request, @"Couldn't create the request"); + XCTAssertNotNil(request, @"Couldn't create the request"); _done = NO; self.error = nil; @@ -187,9 +187,9 @@ - (void)webDAVSession:(DAVSession *)session didReceiveAuthenticationChallenge:(N NSURLCredential *credentials = [NSURLCredential credentialWithUser:self.user password:self.password persistence:NSURLCredentialPersistenceNone]; - STAssertNotNil(credentials, @"Couldn't create credentials"); - STAssertTrue([self.user isEqualToString:credentials.user], @"Couldn't set username"); - STAssertTrue([self.password isEqualToString:credentials.password], @"Couldn't set password"); + XCTAssertNotNil(credentials, @"Couldn't create credentials"); + XCTAssertTrue([self.user isEqualToString:credentials.user], @"Couldn't set username"); + XCTAssertTrue([self.password isEqualToString:credentials.password], @"Couldn't set password"); [[challenge sender] useCredential:credentials forAuthenticationChallenge:challenge]; } From eb2063462bff6d272908e9575c283700eaf9b5d4 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 10:38:35 -0700 Subject: [PATCH 02/20] replace SenTestingKit with XCTest --- DAVKit.xcodeproj/project.pbxproj | 28 +++++++++++++++---- .../xcschemes/DAVKit OS X.xcscheme | 2 +- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/DAVKit.xcodeproj/project.pbxproj b/DAVKit.xcodeproj/project.pbxproj index 6bc5e28..90a7e98 100644 --- a/DAVKit.xcodeproj/project.pbxproj +++ b/DAVKit.xcodeproj/project.pbxproj @@ -37,7 +37,6 @@ 221F8B9D17259BFF004E7B9D /* DAVTest.m in Sources */ = {isa = PBXBuildFile; fileRef = C9FED5B8121D98D600DD1DFF /* DAVTest.m */; }; 221F8BAC17259C79004E7B9D /* libDAVKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FEEF26016CE830C002C1CBF /* libDAVKit.a */; }; 221F8BAF17259DD7004E7B9D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FEEF26216CE830C002C1CBF /* Foundation.framework */; }; - 221F8BB317259F16004E7B9D /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 221F8BB217259F16004E7B9D /* SenTestingKit.framework */; }; 221F8BB417259F60004E7B9D /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FEEF28316CE8596002C1CBF /* MobileCoreServices.framework */; }; 22AC1BAA17426F1C00AB09E1 /* KMSCloseCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AC1B5917426F1B00AB09E1 /* KMSCloseCommand.m */; }; 22AC1BAB17426F1C00AB09E1 /* KMSCloseCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AC1B5917426F1B00AB09E1 /* KMSCloseCommand.m */; }; @@ -69,6 +68,8 @@ 22AC1BC517426F1C00AB09E1 /* KMSTranscriptEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AC1B7417426F1B00AB09E1 /* KMSTranscriptEntry.m */; }; 22AC1BEC17426F1C00AB09E1 /* webdav.json in Resources */ = {isa = PBXBuildFile; fileRef = 22AC1B9917426F1C00AB09E1 /* webdav.json */; }; 22AC1BED17426F1C00AB09E1 /* webdav.json in Resources */ = {isa = PBXBuildFile; fileRef = 22AC1B9917426F1C00AB09E1 /* webdav.json */; }; + 3C90CEA7180C636F00C89B3A /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CFC0D84180C634800B16437 /* XCTest.framework */; }; + 3CFC0D85180C634800B16437 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CFC0D84180C634800B16437 /* XCTest.framework */; }; 5FEEF26316CE830C002C1CBF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FEEF26216CE830C002C1CBF /* Foundation.framework */; }; 5FEEF26F16CE840F002C1CBF /* DAVKit.h in Headers */ = {isa = PBXBuildFile; fileRef = C9FED591121D989900DD1DFF /* DAVKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5FEEF27016CE8426002C1CBF /* NSDateRFC1123.h in Headers */ = {isa = PBXBuildFile; fileRef = F94970EB132A093600713958 /* NSDateRFC1123.h */; }; @@ -183,6 +184,7 @@ 22AC1B7C17426F1B00AB09E1 /* http.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = http.json; sourceTree = ""; }; 22AC1B9917426F1C00AB09E1 /* webdav.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = webdav.json; sourceTree = ""; }; 32DBCF5E0370ADEE00C91783 /* DAVKit_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DAVKit_Prefix.pch; sourceTree = ""; }; + 3CFC0D84180C634800B16437 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; 5FEEF26016CE830C002C1CBF /* libDAVKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDAVKit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 5FEEF26216CE830C002C1CBF /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 5FEEF28316CE8596002C1CBF /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; }; @@ -222,10 +224,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3CFC0D85180C634800B16437 /* XCTest.framework in Frameworks */, 221F8BB417259F60004E7B9D /* MobileCoreServices.framework in Frameworks */, 221F8BAC17259C79004E7B9D /* libDAVKit.a in Frameworks */, 221F8BAF17259DD7004E7B9D /* Foundation.framework in Frameworks */, - 221F8BB317259F16004E7B9D /* SenTestingKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -251,6 +253,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3C90CEA7180C636F00C89B3A /* XCTest.framework in Frameworks */, C9FF7821121C7224001250C7 /* DAVKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -394,6 +397,7 @@ 5FEEF26116CE830C002C1CBF /* Frameworks */ = { isa = PBXGroup; children = ( + 3CFC0D84180C634800B16437 /* XCTest.framework */, 221F8BB217259F16004E7B9D /* SenTestingKit.framework */, 5FEEF26216CE830C002C1CBF /* Foundation.framework */, 5FEEF28816CE869C002C1CBF /* iOS */, @@ -877,7 +881,10 @@ ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "\"$(SDKROOT)/Developer/Library/Frameworks\""; + FRAMEWORK_SEARCH_PATHS = ( + "\\\"$(SDKROOT)/Developer/Library/Frameworks\\\"", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; @@ -900,7 +907,10 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "\"$(SDKROOT)/Developer/Library/Frameworks\""; + FRAMEWORK_SEARCH_PATHS = ( + "\\\"$(SDKROOT)/Developer/Library/Frameworks\\\"", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -979,7 +989,10 @@ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; @@ -1004,7 +1017,10 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit OS X.xcscheme b/DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit OS X.xcscheme index 5dce349..7d6e435 100644 --- a/DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit OS X.xcscheme +++ b/DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit OS X.xcscheme @@ -33,7 +33,7 @@ From 60e9eb9d19da1ff8a88b0e7f2915289adc447236 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 10:42:40 -0700 Subject: [PATCH 03/20] switch to terrence/convert-to-xctest branch --- Tests/MockServer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/MockServer b/Tests/MockServer index c94d5ee..5609658 160000 --- a/Tests/MockServer +++ b/Tests/MockServer @@ -1 +1 @@ -Subproject commit c94d5ee5707150fa92b6a8e6b1c50e1aaa352c92 +Subproject commit 5609658c8a4424d9b1f967fd943317ce5f4fefbe From a2a29ec193bd590e8cd4405187ff6b8e5d2b8681 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 10:58:46 -0700 Subject: [PATCH 04/20] banish all references to SenTestingKit --- DAVKit.xcodeproj/project.pbxproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/DAVKit.xcodeproj/project.pbxproj b/DAVKit.xcodeproj/project.pbxproj index 90a7e98..8a37dcb 100644 --- a/DAVKit.xcodeproj/project.pbxproj +++ b/DAVKit.xcodeproj/project.pbxproj @@ -150,7 +150,6 @@ 221D56BB1726A51400527AD9 /* DAVMoveRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DAVMoveRequest.m; path = Sources/Core/DAVMoveRequest.m; sourceTree = ""; }; 221D56C11726A60C00527AD9 /* DAVRequests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DAVRequests.h; path = Sources/Core/DAVRequests.h; sourceTree = ""; }; 221F8BA817259BFF004E7B9D /* Tests iOS.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests iOS.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 221F8BB217259F16004E7B9D /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = ../../../../iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/Developer/Library/Frameworks/SenTestingKit.framework; sourceTree = SDKROOT; }; 22AC1B5817426F1B00AB09E1 /* KMSCloseCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSCloseCommand.h; sourceTree = ""; }; 22AC1B5917426F1B00AB09E1 /* KMSCloseCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSCloseCommand.m; sourceTree = ""; }; 22AC1B5A17426F1B00AB09E1 /* KMSCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSCommand.h; sourceTree = ""; }; @@ -253,8 +252,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3C90CEA7180C636F00C89B3A /* XCTest.framework in Frameworks */, C9FF7821121C7224001250C7 /* DAVKit.framework in Frameworks */, + 3C90CEA7180C636F00C89B3A /* XCTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -398,7 +397,6 @@ isa = PBXGroup; children = ( 3CFC0D84180C634800B16437 /* XCTest.framework */, - 221F8BB217259F16004E7B9D /* SenTestingKit.framework */, 5FEEF26216CE830C002C1CBF /* Foundation.framework */, 5FEEF28816CE869C002C1CBF /* iOS */, 5FEEF28716CE8696002C1CBF /* OSX */, From 8242d409800e5873a16a072d7f03a2c43bcc89f4 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 11:00:45 -0700 Subject: [PATCH 05/20] fix up oddly missing links to MobileCoreServices.framework --- DAVKit.xcodeproj/project.pbxproj | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/DAVKit.xcodeproj/project.pbxproj b/DAVKit.xcodeproj/project.pbxproj index 8a37dcb..58bc9a5 100644 --- a/DAVKit.xcodeproj/project.pbxproj +++ b/DAVKit.xcodeproj/project.pbxproj @@ -37,7 +37,6 @@ 221F8B9D17259BFF004E7B9D /* DAVTest.m in Sources */ = {isa = PBXBuildFile; fileRef = C9FED5B8121D98D600DD1DFF /* DAVTest.m */; }; 221F8BAC17259C79004E7B9D /* libDAVKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FEEF26016CE830C002C1CBF /* libDAVKit.a */; }; 221F8BAF17259DD7004E7B9D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FEEF26216CE830C002C1CBF /* Foundation.framework */; }; - 221F8BB417259F60004E7B9D /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FEEF28316CE8596002C1CBF /* MobileCoreServices.framework */; }; 22AC1BAA17426F1C00AB09E1 /* KMSCloseCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AC1B5917426F1B00AB09E1 /* KMSCloseCommand.m */; }; 22AC1BAB17426F1C00AB09E1 /* KMSCloseCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AC1B5917426F1B00AB09E1 /* KMSCloseCommand.m */; }; 22AC1BAC17426F1C00AB09E1 /* KMSCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AC1B5B17426F1B00AB09E1 /* KMSCommand.m */; }; @@ -69,6 +68,8 @@ 22AC1BEC17426F1C00AB09E1 /* webdav.json in Resources */ = {isa = PBXBuildFile; fileRef = 22AC1B9917426F1C00AB09E1 /* webdav.json */; }; 22AC1BED17426F1C00AB09E1 /* webdav.json in Resources */ = {isa = PBXBuildFile; fileRef = 22AC1B9917426F1C00AB09E1 /* webdav.json */; }; 3C90CEA7180C636F00C89B3A /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CFC0D84180C634800B16437 /* XCTest.framework */; }; + 3C90CEA9180C687A00C89B3A /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C90CEA8180C687A00C89B3A /* MobileCoreServices.framework */; }; + 3C90CEAA180C689100C89B3A /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C90CEA8180C687A00C89B3A /* MobileCoreServices.framework */; }; 3CFC0D85180C634800B16437 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CFC0D84180C634800B16437 /* XCTest.framework */; }; 5FEEF26316CE830C002C1CBF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FEEF26216CE830C002C1CBF /* Foundation.framework */; }; 5FEEF26F16CE840F002C1CBF /* DAVKit.h in Headers */ = {isa = PBXBuildFile; fileRef = C9FED591121D989900DD1DFF /* DAVKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -91,7 +92,6 @@ 5FEEF28016CE8461002C1CBF /* DAVSession.h in Headers */ = {isa = PBXBuildFile; fileRef = C9FED599121D989900DD1DFF /* DAVSession.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5FEEF28116CE8461002C1CBF /* DAVSession.m in Sources */ = {isa = PBXBuildFile; fileRef = C9FED59A121D989900DD1DFF /* DAVSession.m */; }; 5FEEF28216CE854C002C1CBF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FEEF26216CE830C002C1CBF /* Foundation.framework */; }; - 5FEEF28416CE8598002C1CBF /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FEEF28316CE8596002C1CBF /* MobileCoreServices.framework */; }; 5FEEF28616CE868B002C1CBF /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5FEEF28516CE868A002C1CBF /* CoreServices.framework */; }; C9181BBC121DC31D0022E4AC /* DAVResponseItem.h in Headers */ = {isa = PBXBuildFile; fileRef = C9181BBA121DC31D0022E4AC /* DAVResponseItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; C9181BBD121DC31D0022E4AC /* DAVResponseItem.m in Sources */ = {isa = PBXBuildFile; fileRef = C9181BBB121DC31D0022E4AC /* DAVResponseItem.m */; }; @@ -183,6 +183,7 @@ 22AC1B7C17426F1B00AB09E1 /* http.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = http.json; sourceTree = ""; }; 22AC1B9917426F1C00AB09E1 /* webdav.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = webdav.json; sourceTree = ""; }; 32DBCF5E0370ADEE00C91783 /* DAVKit_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DAVKit_Prefix.pch; sourceTree = ""; }; + 3C90CEA8180C687A00C89B3A /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; }; 3CFC0D84180C634800B16437 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; 5FEEF26016CE830C002C1CBF /* libDAVKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libDAVKit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 5FEEF26216CE830C002C1CBF /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -223,8 +224,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3C90CEA9180C687A00C89B3A /* MobileCoreServices.framework in Frameworks */, 3CFC0D85180C634800B16437 /* XCTest.framework in Frameworks */, - 221F8BB417259F60004E7B9D /* MobileCoreServices.framework in Frameworks */, 221F8BAC17259C79004E7B9D /* libDAVKit.a in Frameworks */, 221F8BAF17259DD7004E7B9D /* Foundation.framework in Frameworks */, ); @@ -234,7 +235,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5FEEF28416CE8598002C1CBF /* MobileCoreServices.framework in Frameworks */, + 3C90CEAA180C689100C89B3A /* MobileCoreServices.framework in Frameworks */, 5FEEF26316CE830C002C1CBF /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -396,6 +397,7 @@ 5FEEF26116CE830C002C1CBF /* Frameworks */ = { isa = PBXGroup; children = ( + 3C90CEA8180C687A00C89B3A /* MobileCoreServices.framework */, 3CFC0D84180C634800B16437 /* XCTest.framework */, 5FEEF26216CE830C002C1CBF /* Foundation.framework */, 5FEEF28816CE869C002C1CBF /* iOS */, From 8ccf270740df1de9d694d05663e8a5946a9009ae Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 11:19:59 -0700 Subject: [PATCH 06/20] tweaks to terrence/convent-to-xctest branch --- Tests/MockServer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/MockServer b/Tests/MockServer index 5609658..d360779 160000 --- a/Tests/MockServer +++ b/Tests/MockServer @@ -1 +1 @@ -Subproject commit 5609658c8a4424d9b1f967fd943317ce5f4fefbe +Subproject commit d36077911db32128d2ede885f8f7004bacf55658 From 3d3948a409686ac403777286bbc40e3fbd2e2e97 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 15:16:14 -0700 Subject: [PATCH 07/20] pull in fixed up MockServer that works with Bot Server for both OS X and iOS --- Tests/MockServer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/MockServer b/Tests/MockServer index d360779..44b279b 160000 --- a/Tests/MockServer +++ b/Tests/MockServer @@ -1 +1 @@ -Subproject commit d36077911db32128d2ede885f8f7004bacf55658 +Subproject commit 44b279bc28a2dc74942ba929b4a46f0664c9d45d From 68b774ebfa420868a641abc031980e8adc4e4329 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 15:18:42 -0700 Subject: [PATCH 08/20] add shared schemes for tests --- .../xcschemes/Tests OS X.xcscheme | 53 +++++++++++++++++++ .../xcshareddata/xcschemes/Tests iOS.xcscheme | 53 +++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme create mode 100644 DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme diff --git a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme new file mode 100644 index 0000000..4381a1d --- /dev/null +++ b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme new file mode 100644 index 0000000..d91761f --- /dev/null +++ b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + From e97deec7539e6951e90130f18ff41ce886b88d9a Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 15:20:26 -0700 Subject: [PATCH 09/20] allow Test code to be Analyzed --- .../xcshareddata/xcschemes/Tests OS X.xcscheme | 16 ++++++++++++++++ .../xcshareddata/xcschemes/Tests iOS.xcscheme | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme index 4381a1d..4282bfc 100644 --- a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme +++ b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme @@ -5,6 +5,22 @@ + + + + + + + + + + + + Date: Mon, 14 Oct 2013 15:25:13 -0700 Subject: [PATCH 10/20] grab latest MockServer, with scaled-back schemes --- Tests/MockServer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/MockServer b/Tests/MockServer index 44b279b..44d3012 160000 --- a/Tests/MockServer +++ b/Tests/MockServer @@ -1 +1 @@ -Subproject commit 44b279bc28a2dc74942ba929b4a46f0664c9d45d +Subproject commit 44d3012b6a7d16f404bf18a06919fb5653c749e0 From b165f44ef30303476b0bb1ad181faa31dd1acaf1 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 15:30:46 -0700 Subject: [PATCH 11/20] clean up of wonkadoodle settings --- DAVKit.xcodeproj/project.pbxproj | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/DAVKit.xcodeproj/project.pbxproj b/DAVKit.xcodeproj/project.pbxproj index 58bc9a5..00eb976 100644 --- a/DAVKit.xcodeproj/project.pbxproj +++ b/DAVKit.xcodeproj/project.pbxproj @@ -860,7 +860,6 @@ GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; }; name = Debug; }; @@ -871,7 +870,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; }; name = Release; }; @@ -881,20 +879,15 @@ ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "\\\"$(SDKROOT)/Developer/Library/Frameworks\\\"", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); + FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_FRAMEWORKS_DIR)"; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = DAVKit_Prefix.pch; INFOPLIST_FILE = "Tests-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; PRODUCT_NAME = "Tests iOS"; - SDKROOT = iphoneos6.1; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; WRAPPER_EXTENSION = octest; }; @@ -907,18 +900,13 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = ( - "\\\"$(SDKROOT)/Developer/Library/Frameworks\\\"", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); + FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_FRAMEWORKS_DIR)"; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = DAVKit_Prefix.pch; INFOPLIST_FILE = "Tests-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; PRODUCT_NAME = "Tests iOS"; - SDKROOT = iphoneos6.1; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; WRAPPER_EXTENSION = octest; ZERO_LINK = NO; @@ -941,17 +929,12 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = DAVKit_Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_UNINITIALIZED_AUTOS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = DAVKit; PUBLIC_HEADERS_FOLDER_PATH = include/DAVKit; - SDKROOT = iphoneos; SKIP_INSTALL = YES; }; name = Debug; @@ -972,11 +955,9 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = DAVKit_Prefix.pch; GCC_WARN_UNINITIALIZED_AUTOS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = DAVKit; PUBLIC_HEADERS_FOLDER_PATH = include/DAVKit; - SDKROOT = iphoneos; SKIP_INSTALL = YES; VALIDATE_PRODUCT = YES; }; From 53782b09c022853ba0371204092387166d50035b Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 15:33:47 -0700 Subject: [PATCH 12/20] convince DAVKit iOS it's actually an iOS framework --- DAVKit.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DAVKit.xcodeproj/project.pbxproj b/DAVKit.xcodeproj/project.pbxproj index 00eb976..fda9c19 100644 --- a/DAVKit.xcodeproj/project.pbxproj +++ b/DAVKit.xcodeproj/project.pbxproj @@ -935,7 +935,9 @@ OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = DAVKit; PUBLIC_HEADERS_FOLDER_PATH = include/DAVKit; + SDKROOT = iphoneos; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; }; name = Debug; }; @@ -958,7 +960,9 @@ OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = DAVKit; PUBLIC_HEADERS_FOLDER_PATH = include/DAVKit; + SDKROOT = iphoneos; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; VALIDATE_PRODUCT = YES; }; name = Release; From e31c92ca6e8689f6c0ef46f5dac5f03552b4d444 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 15:35:47 -0700 Subject: [PATCH 13/20] convince Tests iOS target that it's really for iOS --- DAVKit.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DAVKit.xcodeproj/project.pbxproj b/DAVKit.xcodeproj/project.pbxproj index fda9c19..1773976 100644 --- a/DAVKit.xcodeproj/project.pbxproj +++ b/DAVKit.xcodeproj/project.pbxproj @@ -888,6 +888,7 @@ INFOPLIST_FILE = "Tests-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; PRODUCT_NAME = "Tests iOS"; + SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; WRAPPER_EXTENSION = octest; }; @@ -907,6 +908,7 @@ INFOPLIST_FILE = "Tests-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; PRODUCT_NAME = "Tests iOS"; + SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; WRAPPER_EXTENSION = octest; ZERO_LINK = NO; From 3672975fead8bc186e99efd9fcf6d2628e416249 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 15:46:24 -0700 Subject: [PATCH 14/20] change test bundle wrapper extension from octest to xctest --- DAVKit.xcodeproj/project.pbxproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DAVKit.xcodeproj/project.pbxproj b/DAVKit.xcodeproj/project.pbxproj index 1773976..bf1f159 100644 --- a/DAVKit.xcodeproj/project.pbxproj +++ b/DAVKit.xcodeproj/project.pbxproj @@ -149,7 +149,7 @@ 221D56BA1726A51400527AD9 /* DAVMoveRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DAVMoveRequest.h; path = Sources/Core/DAVMoveRequest.h; sourceTree = ""; }; 221D56BB1726A51400527AD9 /* DAVMoveRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DAVMoveRequest.m; path = Sources/Core/DAVMoveRequest.m; sourceTree = ""; }; 221D56C11726A60C00527AD9 /* DAVRequests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DAVRequests.h; path = Sources/Core/DAVRequests.h; sourceTree = ""; }; - 221F8BA817259BFF004E7B9D /* Tests iOS.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests iOS.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 221F8BA817259BFF004E7B9D /* Tests iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; 22AC1B5817426F1B00AB09E1 /* KMSCloseCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSCloseCommand.h; sourceTree = ""; }; 22AC1B5917426F1B00AB09E1 /* KMSCloseCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSCloseCommand.m; sourceTree = ""; }; 22AC1B5A17426F1B00AB09E1 /* KMSCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSCommand.h; sourceTree = ""; }; @@ -267,7 +267,7 @@ 8DC2EF5B0486A6940098B216 /* DAVKit.framework */, C9FF77EC121C6F51001250C7 /* Tests.xctest */, 5FEEF26016CE830C002C1CBF /* libDAVKit.a */, - 221F8BA817259BFF004E7B9D /* Tests iOS.octest */, + 221F8BA817259BFF004E7B9D /* Tests iOS.xctest */, ); name = Products; sourceTree = ""; @@ -552,7 +552,7 @@ ); name = "Tests iOS"; productName = Tests; - productReference = 221F8BA817259BFF004E7B9D /* Tests iOS.octest */; + productReference = 221F8BA817259BFF004E7B9D /* Tests iOS.xctest */; productType = "com.apple.product-type.bundle"; }; 5FEEF25F16CE830C002C1CBF /* DAVKit iOS */ = { @@ -890,7 +890,7 @@ PRODUCT_NAME = "Tests iOS"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - WRAPPER_EXTENSION = octest; + WRAPPER_EXTENSION = xctest; }; name = Debug; }; @@ -910,7 +910,7 @@ PRODUCT_NAME = "Tests iOS"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - WRAPPER_EXTENSION = octest; + WRAPPER_EXTENSION = xctest; ZERO_LINK = NO; }; name = Release; From a809efee62024b2e2927db193570c9c544ca850b Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 14 Oct 2013 15:47:40 -0700 Subject: [PATCH 15/20] update extensions --- DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit iOS.xcscheme | 2 +- DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit iOS.xcscheme b/DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit iOS.xcscheme index bb9953f..5353739 100644 --- a/DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit iOS.xcscheme +++ b/DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit iOS.xcscheme @@ -33,7 +33,7 @@ diff --git a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme index b3e8a30..999f942 100644 --- a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme +++ b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme @@ -15,7 +15,7 @@ @@ -33,7 +33,7 @@ From 9ffc35a780dc37b1781022743a30b47040318b56 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 19 Oct 2013 21:39:16 -0700 Subject: [PATCH 16/20] Revert "update extensions" This reverts commit a809efee62024b2e2927db193570c9c544ca850b. --- DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit iOS.xcscheme | 2 +- DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit iOS.xcscheme b/DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit iOS.xcscheme index 5353739..bb9953f 100644 --- a/DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit iOS.xcscheme +++ b/DAVKit.xcodeproj/xcshareddata/xcschemes/DAVKit iOS.xcscheme @@ -33,7 +33,7 @@ diff --git a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme index 999f942..b3e8a30 100644 --- a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme +++ b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme @@ -15,7 +15,7 @@ @@ -33,7 +33,7 @@ From f7d0da6a3ac8f510e72b361199dd5decfd94d19f Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 19 Oct 2013 21:39:25 -0700 Subject: [PATCH 17/20] Revert "change test bundle wrapper extension from octest to xctest" This reverts commit 3672975fead8bc186e99efd9fcf6d2628e416249. --- DAVKit.xcodeproj/project.pbxproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DAVKit.xcodeproj/project.pbxproj b/DAVKit.xcodeproj/project.pbxproj index bf1f159..1773976 100644 --- a/DAVKit.xcodeproj/project.pbxproj +++ b/DAVKit.xcodeproj/project.pbxproj @@ -149,7 +149,7 @@ 221D56BA1726A51400527AD9 /* DAVMoveRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DAVMoveRequest.h; path = Sources/Core/DAVMoveRequest.h; sourceTree = ""; }; 221D56BB1726A51400527AD9 /* DAVMoveRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DAVMoveRequest.m; path = Sources/Core/DAVMoveRequest.m; sourceTree = ""; }; 221D56C11726A60C00527AD9 /* DAVRequests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DAVRequests.h; path = Sources/Core/DAVRequests.h; sourceTree = ""; }; - 221F8BA817259BFF004E7B9D /* Tests iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 221F8BA817259BFF004E7B9D /* Tests iOS.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests iOS.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; 22AC1B5817426F1B00AB09E1 /* KMSCloseCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSCloseCommand.h; sourceTree = ""; }; 22AC1B5917426F1B00AB09E1 /* KMSCloseCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSCloseCommand.m; sourceTree = ""; }; 22AC1B5A17426F1B00AB09E1 /* KMSCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSCommand.h; sourceTree = ""; }; @@ -267,7 +267,7 @@ 8DC2EF5B0486A6940098B216 /* DAVKit.framework */, C9FF77EC121C6F51001250C7 /* Tests.xctest */, 5FEEF26016CE830C002C1CBF /* libDAVKit.a */, - 221F8BA817259BFF004E7B9D /* Tests iOS.xctest */, + 221F8BA817259BFF004E7B9D /* Tests iOS.octest */, ); name = Products; sourceTree = ""; @@ -552,7 +552,7 @@ ); name = "Tests iOS"; productName = Tests; - productReference = 221F8BA817259BFF004E7B9D /* Tests iOS.xctest */; + productReference = 221F8BA817259BFF004E7B9D /* Tests iOS.octest */; productType = "com.apple.product-type.bundle"; }; 5FEEF25F16CE830C002C1CBF /* DAVKit iOS */ = { @@ -890,7 +890,7 @@ PRODUCT_NAME = "Tests iOS"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - WRAPPER_EXTENSION = xctest; + WRAPPER_EXTENSION = octest; }; name = Debug; }; @@ -910,7 +910,7 @@ PRODUCT_NAME = "Tests iOS"; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; - WRAPPER_EXTENSION = xctest; + WRAPPER_EXTENSION = octest; ZERO_LINK = NO; }; name = Release; From 3607d095a11db866ce210b78b5dd0cb2d6412e5f Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 19 Oct 2013 21:39:33 -0700 Subject: [PATCH 18/20] Revert "convince Tests iOS target that it's really for iOS" This reverts commit e31c92ca6e8689f6c0ef46f5dac5f03552b4d444. --- DAVKit.xcodeproj/project.pbxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/DAVKit.xcodeproj/project.pbxproj b/DAVKit.xcodeproj/project.pbxproj index 1773976..fda9c19 100644 --- a/DAVKit.xcodeproj/project.pbxproj +++ b/DAVKit.xcodeproj/project.pbxproj @@ -888,7 +888,6 @@ INFOPLIST_FILE = "Tests-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; PRODUCT_NAME = "Tests iOS"; - SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; WRAPPER_EXTENSION = octest; }; @@ -908,7 +907,6 @@ INFOPLIST_FILE = "Tests-Info.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"; PRODUCT_NAME = "Tests iOS"; - SDKROOT = iphoneos; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; WRAPPER_EXTENSION = octest; ZERO_LINK = NO; From d65ec089aaf0f3d241baebb75c04a95bf580cb88 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 19 Oct 2013 21:42:43 -0700 Subject: [PATCH 19/20] Revert "allow Test code to be Analyzed" This reverts commit e97deec7539e6951e90130f18ff41ce886b88d9a. --- .../xcshareddata/xcschemes/Tests OS X.xcscheme | 16 ---------------- .../xcshareddata/xcschemes/Tests iOS.xcscheme | 16 ---------------- 2 files changed, 32 deletions(-) diff --git a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme index 4282bfc..4381a1d 100644 --- a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme +++ b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme @@ -5,22 +5,6 @@ - - - - - - - - - - - - Date: Sat, 19 Oct 2013 21:42:53 -0700 Subject: [PATCH 20/20] Revert "add shared schemes for tests" This reverts commit 68b774ebfa420868a641abc031980e8adc4e4329. --- .../xcschemes/Tests OS X.xcscheme | 53 ------------------- .../xcshareddata/xcschemes/Tests iOS.xcscheme | 53 ------------------- 2 files changed, 106 deletions(-) delete mode 100644 DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme delete mode 100644 DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme diff --git a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme deleted file mode 100644 index 4381a1d..0000000 --- a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests OS X.xcscheme +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme b/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme deleted file mode 100644 index d91761f..0000000 --- a/DAVKit.xcodeproj/xcshareddata/xcschemes/Tests iOS.xcscheme +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -