diff --git a/DAVKit.xcodeproj/project.pbxproj b/DAVKit.xcodeproj/project.pbxproj index a9daee5..fda9c19 100644 --- a/DAVKit.xcodeproj/project.pbxproj +++ b/DAVKit.xcodeproj/project.pbxproj @@ -37,8 +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 */; }; 22AC1BAC17426F1C00AB09E1 /* KMSCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AC1B5B17426F1B00AB09E1 /* KMSCommand.m */; }; @@ -69,6 +67,10 @@ 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 */; }; + 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, ); }; }; 5FEEF27016CE8426002C1CBF /* NSDateRFC1123.h in Headers */ = {isa = PBXBuildFile; fileRef = F94970EB132A093600713958 /* NSDateRFC1123.h */; }; @@ -90,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 */; }; @@ -149,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 = ""; }; @@ -183,6 +183,8 @@ 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; }; 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; }; @@ -211,7 +213,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 = ""; }; @@ -222,10 +224,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 221F8BB417259F60004E7B9D /* MobileCoreServices.framework in Frameworks */, + 3C90CEA9180C687A00C89B3A /* MobileCoreServices.framework in Frameworks */, + 3CFC0D85180C634800B16437 /* XCTest.framework in Frameworks */, 221F8BAC17259C79004E7B9D /* libDAVKit.a in Frameworks */, 221F8BAF17259DD7004E7B9D /* Foundation.framework in Frameworks */, - 221F8BB317259F16004E7B9D /* SenTestingKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -233,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; @@ -252,6 +254,7 @@ buildActionMask = 2147483647; files = ( C9FF7821121C7224001250C7 /* DAVKit.framework in Frameworks */, + 3C90CEA7180C636F00C89B3A /* XCTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -262,7 +265,7 @@ isa = PBXGroup; children = ( 8DC2EF5B0486A6940098B216 /* DAVKit.framework */, - C9FF77EC121C6F51001250C7 /* Tests.octest */, + C9FF77EC121C6F51001250C7 /* Tests.xctest */, 5FEEF26016CE830C002C1CBF /* libDAVKit.a */, 221F8BA817259BFF004E7B9D /* Tests iOS.octest */, ); @@ -394,7 +397,8 @@ 5FEEF26116CE830C002C1CBF /* Frameworks */ = { isa = PBXGroup; children = ( - 221F8BB217259F16004E7B9D /* SenTestingKit.framework */, + 3C90CEA8180C687A00C89B3A /* MobileCoreServices.framework */, + 3CFC0D84180C634800B16437 /* XCTest.framework */, 5FEEF26216CE830C002C1CBF /* Foundation.framework */, 5FEEF28816CE869C002C1CBF /* iOS */, 5FEEF28716CE8696002C1CBF /* OSX */, @@ -603,8 +607,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 */ @@ -856,7 +860,6 @@ GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; }; name = Debug; }; @@ -867,7 +870,6 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; RUN_CLANG_STATIC_ANALYZER = YES; - SDKROOT = macosx; }; name = Release; }; @@ -877,17 +879,15 @@ ALWAYS_SEARCH_USER_PATHS = NO; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "\"$(SDKROOT)/Developer/Library/Frameworks\""; + 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; }; @@ -900,15 +900,13 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "\"$(SDKROOT)/Developer/Library/Frameworks\""; + 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; @@ -931,18 +929,15 @@ 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; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; }; name = Debug; }; @@ -962,12 +957,12 @@ 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; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -979,7 +974,10 @@ 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)", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; @@ -991,11 +989,8 @@ OTHER_LDFLAGS = ( "-framework", Cocoa, - "-framework", - SenTestingKit, ); PRODUCT_NAME = Tests; - WRAPPER_EXTENSION = octest; }; name = Debug; }; @@ -1007,7 +1002,10 @@ 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)", + "$(DEVELOPER_FRAMEWORKS_DIR)", + ); GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1017,11 +1015,8 @@ OTHER_LDFLAGS = ( "-framework", Cocoa, - "-framework", - SenTestingKit, ); PRODUCT_NAME = Tests; - WRAPPER_EXTENSION = octest; ZERO_LINK = NO; }; name = Release; 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 @@ diff --git a/DAVKit.xcworkspace/xcshareddata/DAVKit.xccheckout b/DAVKit.xcworkspace/xcshareddata/DAVKit.xccheckout index d5f0a4a..c16d7b5 100644 --- a/DAVKit.xcworkspace/xcshareddata/DAVKit.xccheckout +++ b/DAVKit.xcworkspace/xcshareddata/DAVKit.xccheckout @@ -5,42 +5,42 @@ IDESourceControlProjectFavoriteDictionaryKey IDESourceControlProjectIdentifier - A5CC9F9B-AB0E-4D46-AEC8-85180AC1FA8F + E2E9C605-950B-4CF2-B3F5-C7075C5E7A99 IDESourceControlProjectName DAVKit IDESourceControlProjectOriginsDictionary - 4DBE8521-CFC4-42BD-BF9F-A2B70FB93257 - ssh://github.com/karelia/MockServer.git - A83B07BE-C454-4AD2-884C-BC9377EDC056 + 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 - B0888B10-C721-48BD-A4B1-60F9E090EEDC - ssh://github.com/karelia/DAVKit.git IDESourceControlProjectPath DAVKit.xcworkspace IDESourceControlProjectRelativeInstallPathDictionary - 4DBE8521-CFC4-42BD-BF9F-A2B70FB93257 + 6FC454DF-E2BB-4398-B7EE-54CB5CC085E8 + .. + 863EF849-9A53-40C2-8298-F48FCC65C254 ../Tests/MockServer - A83B07BE-C454-4AD2-884C-BC9377EDC056 + DE6DA146-0F19-4BB2-84ED-FEB5D1DBB7E0 ../Sources/iso-8601-date-formatter - B0888B10-C721-48BD-A4B1-60F9E090EEDC - .. IDESourceControlProjectURL - ssh://github.com/karelia/DAVKit.git + https://github.com/karelia/DAVKit.git IDESourceControlProjectVersion 110 IDESourceControlProjectWCCIdentifier - B0888B10-C721-48BD-A4B1-60F9E090EEDC + 6FC454DF-E2BB-4398-B7EE-54CB5CC085E8 IDESourceControlProjectWCConfigurations IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - B0888B10-C721-48BD-A4B1-60F9E090EEDC + 6FC454DF-E2BB-4398-B7EE-54CB5CC085E8 IDESourceControlWCCName DAVKit @@ -48,7 +48,7 @@ IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - A83B07BE-C454-4AD2-884C-BC9377EDC056 + DE6DA146-0F19-4BB2-84ED-FEB5D1DBB7E0 IDESourceControlWCCName iso-8601-date-formatter @@ -56,7 +56,7 @@ IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - 4DBE8521-CFC4-42BD-BF9F-A2B70FB93257 + 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 de2345b..8533513 100644 --- a/Sources/Tests/DAVTest.m +++ b/Sources/Tests/DAVTest.m @@ -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]; } diff --git a/Tests/MockServer b/Tests/MockServer index fa62b90..44d3012 160000 --- a/Tests/MockServer +++ b/Tests/MockServer @@ -1 +1 @@ -Subproject commit fa62b908ac1beec1c7ce068a44dcb7703a96d903 +Subproject commit 44d3012b6a7d16f404bf18a06919fb5653c749e0