From 25bdca12016f004d3aa4b1e9e0af0846c3a73a27 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 20:54:11 -0700 Subject: [PATCH 01/19] ARCification first pass --- KMSCloseCommand.m | 4 +--- KMSConnection.m | 22 +++------------------- KMSListener.m | 8 +++----- KMSPauseCommand.m | 2 +- KMSRegExResponder.m | 11 +---------- KMSResponseCollection.m | 11 +---------- KMSSendDataCommand.m | 9 +-------- KMSSendServerDataCommand.m | 2 +- KMSSendStringCommand.m | 9 +-------- KMSServer.m | 21 ++++++--------------- KMSTranscriptEntry.m | 9 +-------- MockServer/Info.plist | 28 ++++++++++++++++++++++++++++ 12 files changed, 48 insertions(+), 88 deletions(-) create mode 100644 MockServer/Info.plist diff --git a/KMSCloseCommand.m b/KMSCloseCommand.m index fc8dae1..44f845a 100644 --- a/KMSCloseCommand.m +++ b/KMSCloseCommand.m @@ -13,9 +13,7 @@ @implementation KMSCloseCommand + (KMSCloseCommand*)closeCommand { - KMSCloseCommand* result = [[KMSCloseCommand alloc] init]; - - return [result autorelease]; + return [[KMSCloseCommand alloc] init]; } - (NSTimeInterval)performOnConnection:(KMSConnection*)connection server:(KMSServer*)server diff --git a/KMSConnection.m b/KMSConnection.m index a076770..9855a55 100644 --- a/KMSConnection.m +++ b/KMSConnection.m @@ -46,7 +46,7 @@ + (KMSConnection*)connectionWithSocket:(int)socket responder:(KMSResponder*)resp { KMSConnection* connection = [[KMSConnection alloc] initWithSocket:socket responder:responder server:server]; - return [connection autorelease]; + return connection; } - (id)initWithSocket:(int)socket responder:(KMSResponder*)responder server:(KMSServer*)server @@ -62,8 +62,8 @@ - (id)initWithSocket:(int)socket responder:(KMSResponder*)responder server:(KMSS CFStreamCreatePairWithSocket(NULL, socket, &readStream, &writeStream); self.socket = socket; - self.input = [self setupStream:(NSStream*)readStream mode:InputRunMode]; - self.output = [self setupStream:(NSStream*)writeStream mode:OutputRunMode]; + self.input = [self setupStream:(NSStream*)CFBridgingRelease(readStream) mode:InputRunMode]; + self.output = [self setupStream:(NSStream*)CFBridgingRelease(writeStream) mode:OutputRunMode]; CFRelease(readStream); CFRelease(writeStream); @@ -75,17 +75,6 @@ - (id)initWithSocket:(int)socket responder:(KMSResponder*)responder server:(KMSS - (void)dealloc { KMSAssert((_input == nil) && (_output == nil)); - - [_input release]; - [_output release]; - [_outputData release]; - [_server release]; - -#if DEBUG - [_lastDisconnectReason release]; -#endif - - [super dealloc]; } #pragma mark - Public API @@ -146,8 +135,6 @@ - (void)processInput } [self queueCommands:commands]; - - [request release]; } } @@ -183,7 +170,6 @@ - (void)processNextCommand if (count) { KMSCommand* command = self.commands[0]; - [command retain]; [self.commands removeObjectAtIndex:0]; NSTimeInterval delay = [command performOnConnection:self server:self.server]; @@ -194,8 +180,6 @@ - (void)processNextCommand [self processNextCommand]; }); } - - [command release]; } } diff --git a/KMSListener.m b/KMSListener.m index 1a1f01b..97d3113 100644 --- a/KMSListener.m +++ b/KMSListener.m @@ -33,7 +33,7 @@ + (KMSListener*)listenerWithPort:(NSUInteger)port connectionBlock:(ConnectionBlo { KMSListener* listener = [[KMSListener alloc] initWithPort:port connectionBlock:block]; - return [listener autorelease]; + return listener; } - (id)initWithPort:(NSUInteger)port connectionBlock:(ConnectionBlock)block @@ -51,8 +51,6 @@ - (id)initWithPort:(NSUInteger)port connectionBlock:(ConnectionBlock)block - (void)dealloc { KMSAssert(_listener == nil); - - [super dealloc]; } #pragma mark - Public API @@ -149,7 +147,7 @@ - (void)acceptConnectionOnSocket:(int)socket static void callbackAcceptConnection(CFSocketRef s, CFSocketCallBackType type, CFDataRef address, const void *data, void *info) { - KMSListener* obj = (KMSListener*)info; + KMSListener* obj = (__bridge KMSListener*)info; KMSAssert(type == kCFSocketAcceptCallBack); KMSAssert(obj && (obj->_listener == s)); KMSAssert(data); @@ -240,7 +238,7 @@ - (BOOL)retrievePortForSocket:(int)socket - (BOOL)makeCFSocketForSocket:(int)socket { - CFSocketContext context = { 0, (void *) self, NULL, NULL, NULL }; + CFSocketContext context = { 0, (__bridge void *) self, NULL, NULL, NULL }; KMSAssert(_listener == NULL); _listener = CFSocketCreateWithNative(NULL, socket, kCFSocketAcceptCallBack, callbackAcceptConnection, &context); diff --git a/KMSPauseCommand.m b/KMSPauseCommand.m index be58e91..4944e18 100644 --- a/KMSPauseCommand.m +++ b/KMSPauseCommand.m @@ -16,7 +16,7 @@ + (KMSPauseCommand*)pauseFor:(NSTimeInterval)delay KMSPauseCommand* result = [[KMSPauseCommand alloc] init]; result.delay = delay; - return [result autorelease]; + return result; } - (NSTimeInterval)performOnConnection:(KMSConnection*)connection server:(KMSServer*)server diff --git a/KMSRegExResponder.m b/KMSRegExResponder.m index 9a03c61..7f76a0f 100644 --- a/KMSRegExResponder.m +++ b/KMSRegExResponder.m @@ -27,7 +27,7 @@ + (KMSRegExResponder*)responderWithResponses:(NSArray *)responses { KMSRegExResponder* server = [[KMSRegExResponder alloc] initWithResponses:responses]; - return [server autorelease]; + return server; } - (id)initWithResponses:(NSArray *)responses @@ -69,15 +69,6 @@ - (id)initWithResponses:(NSArray *)responses return self; } -- (void)dealloc -{ - [_initialResponse release]; - [_responses release]; - [_requests release]; - - [super dealloc]; -} - #pragma mark - Public API - (NSArray*)responseForRequest:(NSString*)request substitutions:(NSDictionary*)substitutions diff --git a/KMSResponseCollection.m b/KMSResponseCollection.m index b5d3852..4bce32d 100644 --- a/KMSResponseCollection.m +++ b/KMSResponseCollection.m @@ -22,7 +22,7 @@ + (KMSResponseCollection*)collectionWithURL:(NSURL *)url { KMSResponseCollection* collection = [[KMSResponseCollection alloc] initWithURL:url]; - return [collection autorelease]; + return collection; } - (id)initWithURL:(NSURL*)url @@ -48,7 +48,6 @@ - (id)initWithURL:(NSURL*)url else { KMSLog(@"failed to load response collection with error: %@", error); - [self release]; self = nil; } } @@ -56,14 +55,6 @@ - (id)initWithURL:(NSURL*)url return self; } -- (void)dealloc -{ - [_sets release]; - [_responses release]; - - [super dealloc]; -} - - (NSArray*)responsesWithName:(NSString*)name { NSMutableArray* responses = [NSMutableArray array]; diff --git a/KMSSendDataCommand.m b/KMSSendDataCommand.m index 1bc14b9..4b33c38 100644 --- a/KMSSendDataCommand.m +++ b/KMSSendDataCommand.m @@ -17,14 +17,7 @@ + (KMSSendDataCommand*)sendData:(NSData *)data KMSSendDataCommand* result = [[KMSSendDataCommand alloc] init]; result.data = data; - return [result autorelease]; -} - -- (void)dealloc -{ - [_data release]; - - [super dealloc]; + return result; } - (NSTimeInterval)performOnConnection:(KMSConnection*)connection server:(KMSServer*)server diff --git a/KMSSendServerDataCommand.m b/KMSSendServerDataCommand.m index 8ed6447..3c5e232 100644 --- a/KMSSendServerDataCommand.m +++ b/KMSSendServerDataCommand.m @@ -16,7 +16,7 @@ + (KMSSendServerDataCommand*)sendServerData { KMSSendServerDataCommand* result = [[KMSSendServerDataCommand alloc] init]; - return [result autorelease]; + return result; } - (NSTimeInterval)performOnConnection:(KMSConnection*)connection server:(KMSServer*)server diff --git a/KMSSendStringCommand.m b/KMSSendStringCommand.m index c60e1f3..6ab16cf 100644 --- a/KMSSendStringCommand.m +++ b/KMSSendStringCommand.m @@ -17,14 +17,7 @@ + (KMSSendStringCommand*)sendString:(NSString *)string KMSSendStringCommand* result = [[KMSSendStringCommand alloc] init]; result.string = string; - return [result autorelease]; -} - -- (void)dealloc -{ - [_string release]; - - [super dealloc]; + return result; } - (NSTimeInterval)performOnConnection:(KMSConnection*)connection server:(KMSServer*)server diff --git a/KMSServer.m b/KMSServer.m index aa226e2..b6232ca 100644 --- a/KMSServer.m +++ b/KMSServer.m @@ -54,14 +54,14 @@ + (KMSServer*)serverWithResponder:(KMSResponder*)responder { KMSServer* server = [[KMSServer alloc] initWithPort:0 responder:responder]; - return [server autorelease]; + return server; } + (KMSServer*)serverWithPort:(NSUInteger)port responder:(KMSResponder*)responder { KMSServer* server = [[KMSServer alloc] initWithPort:port responder:responder]; - return [server autorelease]; + return server; } - (id)initWithPort:(NSUInteger)port responder:(KMSResponder*)responder @@ -72,14 +72,14 @@ - (id)initWithPort:(NSUInteger)port responder:(KMSResponder*)responder { dispatch_queue_t queue = dispatch_queue_create("com.karelia.mockserver", 0); self.queue = queue; - dispatch_queue_set_specific(queue, &queueIdentifierKey, self, NULL); + dispatch_queue_set_specific(queue, &queueIdentifierKey, (__bridge void *)(self), NULL); self.responder = responder; self.connections = [NSMutableArray array]; self.transcript = [NSMutableArray array]; - NSDateFormatter* formatter = [[[NSDateFormatter alloc] init] autorelease]; + NSDateFormatter* formatter = [[NSDateFormatter alloc] init]; [formatter setFormatterBehavior:NSDateFormatterBehavior10_4]; - [formatter setLocale:[[[NSLocale alloc] initWithLocaleIdentifier:@"en_US"] autorelease]]; + [formatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US"]]; [formatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]]; [formatter setDateFormat:@"EEE, dd MMM yyyy HH:mm:ss zzz"]; self.rfc1123DateFormatter = formatter; @@ -107,16 +107,7 @@ - (id)initWithPort:(NSUInteger)port responder:(KMSResponder*)responder - (void)dealloc { KMSAssert([self.connections count] == 0); - dispatch_release(_queue); _queue = nil; - - [_connections release]; - [_data release]; - [_dataListener release]; - [_responder release]; - [_transcript release]; - - [super dealloc]; } #pragma mark - Public API @@ -282,7 +273,7 @@ + (void)setLoggingLevel:(KMSLogLevel)level #pragma mark - Debugging - (BOOL)currentQueueTargetsServerQueue { - return dispatch_get_specific(&queueIdentifierKey) == self; + return dispatch_get_specific(&queueIdentifierKey) == (__bridge void *)(self); } @end diff --git a/KMSTranscriptEntry.m b/KMSTranscriptEntry.m index 53e9b8b..cc921c7 100644 --- a/KMSTranscriptEntry.m +++ b/KMSTranscriptEntry.m @@ -12,14 +12,7 @@ + (KMSTranscriptEntry*)entryWithType:(KMSTranscriptEntryType)type value:(id)valu entry.type = type; entry.value = value; - return [entry autorelease]; -} - -- (void)dealloc -{ - [_value release]; - - [super dealloc]; + return entry; } - (NSString*)description diff --git a/MockServer/Info.plist b/MockServer/Info.plist new file mode 100644 index 0000000..5b9ba69 --- /dev/null +++ b/MockServer/Info.plist @@ -0,0 +1,28 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + org.karelia.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSHumanReadableCopyright + Copyright © 2015 Karelia Software. All rights reserved. + NSPrincipalClass + + + From 19d8a5c0c9e4651a53394b22e06275f4f14b0128 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 20:54:41 -0700 Subject: [PATCH 02/19] add MockServer framework target --- MockServer.xcodeproj/project.pbxproj | 527 +++++++++++++++++- .../xcschemes/Unit Tests OS X.xcscheme | 11 +- .../xcschemes/Unit Tests iOS.xcscheme | 2 +- MockServer/MockServer.h | 19 + MockServerTests/Info.plist | 24 + MockServerTests/MockServerTests.m | 40 ++ 6 files changed, 604 insertions(+), 19 deletions(-) create mode 100644 MockServer/MockServer.h create mode 100644 MockServerTests/Info.plist create mode 100644 MockServerTests/MockServerTests.m diff --git a/MockServer.xcodeproj/project.pbxproj b/MockServer.xcodeproj/project.pbxproj index 2241eee..abb6286 100644 --- a/MockServer.xcodeproj/project.pbxproj +++ b/MockServer.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 47; objects = { /* Begin PBXBuildFile section */ @@ -27,6 +27,31 @@ 22A6603416B32EFB00117D24 /* KMSCloseCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6603316B32EFB00117D24 /* KMSCloseCommand.m */; }; 22BC963B167FB72200144FFE /* http.json in Resources */ = {isa = PBXBuildFile; fileRef = 22BC963A167FB72200144FFE /* http.json */; }; 22F6D0D8165A5B2400443CC9 /* KMSRegExResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F6D0D7165A5B2400443CC9 /* KMSRegExResponder.m */; }; + 3CD748A41B366825009C00C9 /* MockServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CD748A31B366825009C00C9 /* MockServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3CD748AA1B366826009C00C9 /* MockServer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CD7489F1B366825009C00C9 /* MockServer.framework */; }; + 3CD748B11B366826009C00C9 /* MockServerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CD748B01B366826009C00C9 /* MockServerTests.m */; }; + 3CD748BB1B36687F009C00C9 /* KMSCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602416B3198300117D24 /* KMSCommand.m */; }; + 3CD748BD1B36687F009C00C9 /* KMSServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A201164C53F3008D4ADE /* KMSServer.m */; }; + 3CD748C01B36687F009C00C9 /* KMSRegExResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F6D0D7165A5B2400443CC9 /* KMSRegExResponder.m */; }; + 3CD748C21B36687F009C00C9 /* KMSResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A209164C53F3008D4ADE /* KMSResponder.m */; }; + 3CD748C41B36687F009C00C9 /* KMSResponseCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 22662EE6165D219A005FCC4A /* KMSResponseCollection.m */; }; + 3CD748C61B36687F009C00C9 /* KMSTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 224AB392166E5A7A0066B1C6 /* KMSTestCase.m */; }; + 3CD748C81B36687F009C00C9 /* KMSTranscriptEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 2289BC0416AD63CD007DC402 /* KMSTranscriptEntry.m */; }; + 3CD748C91B366923009C00C9 /* KMSCloseCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6603316B32EFB00117D24 /* KMSCloseCommand.m */; }; + 3CD748CA1B366923009C00C9 /* KMSPauseCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602D16B32BFD00117D24 /* KMSPauseCommand.m */; }; + 3CD748CB1B366923009C00C9 /* KMSSendDataCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602716B32B4A00117D24 /* KMSSendDataCommand.m */; }; + 3CD748CC1B366923009C00C9 /* KMSSendServerDataCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6603016B32C7E00117D24 /* KMSSendServerDataCommand.m */; }; + 3CD748CD1B366923009C00C9 /* KMSSendStringCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602A16B32BA300117D24 /* KMSSendStringCommand.m */; }; + 3CD748CE1B366923009C00C9 /* KMSConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A203164C53F3008D4ADE /* KMSConnection.m */; }; + 3CD748CF1B366923009C00C9 /* KMSListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A207164C53F3008D4ADE /* KMSListener.m */; }; + 3CD748D01B36693D009C00C9 /* KMSCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A6602316B3198300117D24 /* KMSCommand.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3CD748D11B36693D009C00C9 /* KMSServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 2239A200164C53F3008D4ADE /* KMSServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3CD748D21B36693D009C00C9 /* KMSState.h in Headers */ = {isa = PBXBuildFile; fileRef = 227CF8C41671001900F28590 /* KMSState.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3CD748D31B36693D009C00C9 /* KMSRegExResponder.h in Headers */ = {isa = PBXBuildFile; fileRef = 22F6D0D6165A5B2400443CC9 /* KMSRegExResponder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3CD748D41B36693D009C00C9 /* KMSResponder.h in Headers */ = {isa = PBXBuildFile; fileRef = 2239A208164C53F3008D4ADE /* KMSResponder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3CD748D51B36693D009C00C9 /* KMSResponseCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 22662EE5165D2199005FCC4A /* KMSResponseCollection.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3CD748D61B36693D009C00C9 /* KMSTestCase.h in Headers */ = {isa = PBXBuildFile; fileRef = 224AB391166E5A7A0066B1C6 /* KMSTestCase.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 3CD748D71B36693D009C00C9 /* KMSTranscriptEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 2289BC0316AD63CD007DC402 /* KMSTranscriptEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5F53DAED1727B9E800DE6269 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 220AD7991509019B00748655 /* SenTestingKit.framework */; }; 5F53DAFF1727BAF000DE6269 /* KMSCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602416B3198300117D24 /* KMSCommand.m */; }; 5F53DB001727BAF000DE6269 /* KMSServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A201164C53F3008D4ADE /* KMSServer.m */; }; @@ -49,6 +74,16 @@ 5F53DB111727BB0D00DE6269 /* webdav.json in Resources */ = {isa = PBXBuildFile; fileRef = 22662EEE165D2C65005FCC4A /* webdav.json */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 3CD748AB1B366826009C00C9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3CD7489E1B366825009C00C9; + remoteInfo = MockServer; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 22FA97F715090855001728B8 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -62,7 +97,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 220AD7981509019B00748655 /* UnitTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = UnitTests.octest; path = "UnitTests OSX.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 220AD7981509019B00748655 /* UnitTests OSX.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "UnitTests OSX.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; 220AD7991509019B00748655 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; 2239A1FD164C5381008D4ADE /* UnitTest.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = UnitTest.plist; sourceTree = ""; }; 2239A200164C53F3008D4ADE /* KMSServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSServer.h; sourceTree = SOURCE_ROOT; }; @@ -108,6 +143,12 @@ 22F6D0DA165A65AB00443CC9 /* Classes.graffle */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Classes.graffle; sourceTree = ""; }; 22F6D0DB165A65AB00443CC9 /* Design-template.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = "Design-template.md"; sourceTree = ""; wrapsLines = 1; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 3CD7489F1B366825009C00C9 /* MockServer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MockServer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 3CD748A21B366825009C00C9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 3CD748A31B366825009C00C9 /* MockServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockServer.h; sourceTree = ""; }; + 3CD748A91B366825009C00C9 /* MockServerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MockServerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3CD748AF1B366826009C00C9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 3CD748B01B366826009C00C9 /* MockServerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockServerTests.m; sourceTree = ""; }; 5F53DAEC1727B9E800DE6269 /* UnitTests iOS.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "UnitTests iOS.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; 5F53DAEE1727B9E800DE6269 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; /* End PBXFileReference section */ @@ -121,6 +162,21 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3CD7489B1B366825009C00C9 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3CD748A61B366825009C00C9 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 3CD748AA1B366826009C00C9 /* MockServer.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5F53DAE81727B9E800DE6269 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -135,8 +191,10 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 220AD7981509019B00748655 /* UnitTests.octest */, + 220AD7981509019B00748655 /* UnitTests OSX.octest */, 5F53DAEC1727B9E800DE6269 /* UnitTests iOS.octest */, + 3CD7489F1B366825009C00C9 /* MockServer.framework */, + 3CD748A91B366825009C00C9 /* MockServerTests.xctest */, ); name = Products; sourceTree = ""; @@ -229,6 +287,8 @@ 22B47C59164AE5EE006E80EB /* MockServer */, 2239A1FB164C5381008D4ADE /* UnitTests */, 29B97317FDCFA39411CA2CEA /* Resources */, + 3CD748A01B366825009C00C9 /* MockServer */, + 3CD748AD1B366826009C00C9 /* MockServerTests */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, ); @@ -252,8 +312,61 @@ name = Frameworks; sourceTree = ""; }; + 3CD748A01B366825009C00C9 /* MockServer */ = { + isa = PBXGroup; + children = ( + 3CD748A31B366825009C00C9 /* MockServer.h */, + 3CD748A11B366825009C00C9 /* Supporting Files */, + ); + path = MockServer; + sourceTree = ""; + }; + 3CD748A11B366825009C00C9 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 3CD748A21B366825009C00C9 /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 3CD748AD1B366826009C00C9 /* MockServerTests */ = { + isa = PBXGroup; + children = ( + 3CD748B01B366826009C00C9 /* MockServerTests.m */, + 3CD748AE1B366826009C00C9 /* Supporting Files */, + ); + path = MockServerTests; + sourceTree = ""; + }; + 3CD748AE1B366826009C00C9 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 3CD748AF1B366826009C00C9 /* Info.plist */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + 3CD7489C1B366825009C00C9 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 3CD748A41B366825009C00C9 /* MockServer.h in Headers */, + 3CD748D01B36693D009C00C9 /* KMSCommand.h in Headers */, + 3CD748D31B36693D009C00C9 /* KMSRegExResponder.h in Headers */, + 3CD748D41B36693D009C00C9 /* KMSResponder.h in Headers */, + 3CD748D51B36693D009C00C9 /* KMSResponseCollection.h in Headers */, + 3CD748D11B36693D009C00C9 /* KMSServer.h in Headers */, + 3CD748D21B36693D009C00C9 /* KMSState.h in Headers */, + 3CD748D61B36693D009C00C9 /* KMSTestCase.h in Headers */, + 3CD748D71B36693D009C00C9 /* KMSTranscriptEntry.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ 220AD7971509019B00748655 /* UnitTests OSX */ = { isa = PBXNativeTarget; @@ -271,8 +384,44 @@ ); name = "UnitTests OSX"; productName = Tests; - productReference = 220AD7981509019B00748655 /* UnitTests.octest */; - productType = "com.apple.product-type.bundle"; + productReference = 220AD7981509019B00748655 /* UnitTests OSX.octest */; + productType = "com.apple.product-type.bundle.ocunit-test"; + }; + 3CD7489E1B366825009C00C9 /* MockServer */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3CD748B21B366826009C00C9 /* Build configuration list for PBXNativeTarget "MockServer" */; + buildPhases = ( + 3CD7489A1B366825009C00C9 /* Sources */, + 3CD7489B1B366825009C00C9 /* Frameworks */, + 3CD7489C1B366825009C00C9 /* Headers */, + 3CD7489D1B366825009C00C9 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = MockServer; + productName = MockServer; + productReference = 3CD7489F1B366825009C00C9 /* MockServer.framework */; + productType = "com.apple.product-type.framework"; + }; + 3CD748A81B366825009C00C9 /* MockServerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 3CD748B61B366826009C00C9 /* Build configuration list for PBXNativeTarget "MockServerTests" */; + buildPhases = ( + 3CD748A51B366825009C00C9 /* Sources */, + 3CD748A61B366825009C00C9 /* Frameworks */, + 3CD748A71B366825009C00C9 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 3CD748AC1B366826009C00C9 /* PBXTargetDependency */, + ); + name = MockServerTests; + productName = MockServerTests; + productReference = 3CD748A91B366825009C00C9 /* MockServerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; }; 5F53DAEB1727B9E800DE6269 /* UnitTests iOS */ = { isa = PBXNativeTarget; @@ -290,7 +439,7 @@ name = "UnitTests iOS"; productName = "UnitTests-iOS"; productReference = 5F53DAEC1727B9E800DE6269 /* UnitTests iOS.octest */; - productType = "com.apple.product-type.bundle"; + productType = "com.apple.product-type.bundle.ocunit-test"; }; /* End PBXNativeTarget section */ @@ -299,11 +448,20 @@ isa = PBXProject; attributes = { CLASSPREFIX = KMS; - LastUpgradeCheck = 0440; + LastTestingUpgradeCheck = 0630; + LastUpgradeCheck = 0630; ORGANIZATIONNAME = "Karelia Software"; + TargetAttributes = { + 3CD7489E1B366825009C00C9 = { + CreatedOnToolsVersion = 6.3.2; + }; + 3CD748A81B366825009C00C9 = { + CreatedOnToolsVersion = 6.3.2; + }; + }; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MockServer" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 6.3"; developmentRegion = en; hasScannedForEncodings = 1; knownRegions = ( @@ -325,6 +483,8 @@ targets = ( 220AD7971509019B00748655 /* UnitTests OSX */, 5F53DAEB1727B9E800DE6269 /* UnitTests iOS */, + 3CD7489E1B366825009C00C9 /* MockServer */, + 3CD748A81B366825009C00C9 /* MockServerTests */, ); }; /* End PBXProject section */ @@ -340,6 +500,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3CD7489D1B366825009C00C9 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3CD748A71B366825009C00C9 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5F53DAE91727B9E800DE6269 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -407,6 +581,35 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 3CD7489A1B366825009C00C9 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3CD748C91B366923009C00C9 /* KMSCloseCommand.m in Sources */, + 3CD748CA1B366923009C00C9 /* KMSPauseCommand.m in Sources */, + 3CD748CB1B366923009C00C9 /* KMSSendDataCommand.m in Sources */, + 3CD748CC1B366923009C00C9 /* KMSSendServerDataCommand.m in Sources */, + 3CD748CD1B366923009C00C9 /* KMSSendStringCommand.m in Sources */, + 3CD748CE1B366923009C00C9 /* KMSConnection.m in Sources */, + 3CD748CF1B366923009C00C9 /* KMSListener.m in Sources */, + 3CD748BB1B36687F009C00C9 /* KMSCommand.m in Sources */, + 3CD748BD1B36687F009C00C9 /* KMSServer.m in Sources */, + 3CD748C01B36687F009C00C9 /* KMSRegExResponder.m in Sources */, + 3CD748C21B36687F009C00C9 /* KMSResponder.m in Sources */, + 3CD748C41B36687F009C00C9 /* KMSResponseCollection.m in Sources */, + 3CD748C61B36687F009C00C9 /* KMSTestCase.m in Sources */, + 3CD748C81B36687F009C00C9 /* KMSTranscriptEntry.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 3CD748A51B366825009C00C9 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3CD748B11B366826009C00C9 /* MockServerTests.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5F53DAE71727B9E800DE6269 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -432,12 +635,19 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 3CD748AC1B366826009C00C9 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3CD7489E1B366825009C00C9 /* MockServer */; + targetProxy = 3CD748AB1B366826009C00C9 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 220AD7A81509019B00748655 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; @@ -466,7 +676,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -488,7 +697,6 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -506,6 +714,276 @@ }; name = Plugin; }; + 3CD748B31B366826009C00C9 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_VERSION = A; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = MockServer/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 3CD748B41B366826009C00C9 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_VERSION = A; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = MockServer/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 3CD748B51B366826009C00C9 /* Plugin */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_VERSION = A; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = MockServer/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Plugin; + }; + 3CD748B71B366826009C00C9 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(inherited)", + ); + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = MockServerTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 3CD748B81B366826009C00C9 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(inherited)", + ); + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = MockServerTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 3CD748B91B366826009C00C9 /* Plugin */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(DEVELOPER_FRAMEWORKS_DIR)", + "$(inherited)", + ); + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + INFOPLIST_FILE = MockServerTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Plugin; + }; 5F53DAFB1727B9E800DE6269 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -596,11 +1074,10 @@ 79A857940B9267CA00D9C844 /* Plugin */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.5; + MACOSX_DEPLOYMENT_TARGET = 10.10; SDKROOT = macosx; }; name = Plugin; @@ -608,11 +1085,10 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.5; + MACOSX_DEPLOYMENT_TARGET = 10.10; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; }; @@ -621,12 +1097,11 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO; GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.5; + MACOSX_DEPLOYMENT_TARGET = 10.10; SDKROOT = macosx; }; name = Release; @@ -644,6 +1119,24 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 3CD748B21B366826009C00C9 /* Build configuration list for PBXNativeTarget "MockServer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3CD748B31B366826009C00C9 /* Debug */, + 3CD748B41B366826009C00C9 /* Release */, + 3CD748B51B366826009C00C9 /* Plugin */, + ); + defaultConfigurationIsVisible = 0; + }; + 3CD748B61B366826009C00C9 /* Build configuration list for PBXNativeTarget "MockServerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 3CD748B71B366826009C00C9 /* Debug */, + 3CD748B81B366826009C00C9 /* Release */, + 3CD748B91B366826009C00C9 /* Plugin */, + ); + defaultConfigurationIsVisible = 0; + }; 5F53DAFE1727B9E800DE6269 /* Build configuration list for PBXNativeTarget "UnitTests iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests OS X.xcscheme b/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests OS X.xcscheme index 9d62a00..2c5e19c 100644 --- a/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests OS X.xcscheme +++ b/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests OS X.xcscheme @@ -1,6 +1,6 @@ + + + + diff --git a/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests iOS.xcscheme b/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests iOS.xcscheme index 2c932b6..0c5746d 100644 --- a/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests iOS.xcscheme +++ b/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests iOS.xcscheme @@ -1,6 +1,6 @@ + +//! Project version number for MockServer. +FOUNDATION_EXPORT double MockServerVersionNumber; + +//! Project version string for MockServer. +FOUNDATION_EXPORT const unsigned char MockServerVersionString[]; + +// In this header, you should import all the public headers of your framework using statements like #import + + diff --git a/MockServerTests/Info.plist b/MockServerTests/Info.plist new file mode 100644 index 0000000..eb32fa5 --- /dev/null +++ b/MockServerTests/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + org.karelia.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + BNDL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/MockServerTests/MockServerTests.m b/MockServerTests/MockServerTests.m new file mode 100644 index 0000000..8bf243f --- /dev/null +++ b/MockServerTests/MockServerTests.m @@ -0,0 +1,40 @@ +// +// MockServerTests.m +// MockServerTests +// +// Created by Terrence Talbot on 6/20/15. +// Copyright (c) 2015 Karelia Software. All rights reserved. +// + +#import +#import + +@interface MockServerTests : XCTestCase + +@end + +@implementation MockServerTests + +- (void)setUp { + [super setUp]; + // Put setup code here. This method is called before the invocation of each test method in the class. +} + +- (void)tearDown { + // Put teardown code here. This method is called after the invocation of each test method in the class. + [super tearDown]; +} + +- (void)testExample { + // This is an example of a functional test case. + XCTAssert(YES, @"Pass"); +} + +- (void)testPerformanceExample { + // This is an example of a performance test case. + [self measureBlock:^{ + // Put the code you want to measure the time of here. + }]; +} + +@end From 5b866a947dc44133818a7f19ae18915813ceb813 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 20:56:27 -0700 Subject: [PATCH 03/19] remove old test targets --- MockServer.xcodeproj/project.pbxproj | 385 --------------------------- 1 file changed, 385 deletions(-) diff --git a/MockServer.xcodeproj/project.pbxproj b/MockServer.xcodeproj/project.pbxproj index abb6286..c38a826 100644 --- a/MockServer.xcodeproj/project.pbxproj +++ b/MockServer.xcodeproj/project.pbxproj @@ -7,26 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 220AD79A1509019B00748655 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 220AD7991509019B00748655 /* SenTestingKit.framework */; }; - 2239A20A164C53F3008D4ADE /* KMSServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A201164C53F3008D4ADE /* KMSServer.m */; }; - 2239A20B164C53F3008D4ADE /* KMSConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A203164C53F3008D4ADE /* KMSConnection.m */; }; - 2239A20D164C53F3008D4ADE /* KMSListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A207164C53F3008D4ADE /* KMSListener.m */; }; - 2239A20E164C53F3008D4ADE /* KMSResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A209164C53F3008D4ADE /* KMSResponder.m */; }; - 224AB38F166E5A660066B1C6 /* KMSCollectionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 224AB38D166E5A660066B1C6 /* KMSCollectionTests.m */; }; - 224AB390166E5A660066B1C6 /* KMSManualTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 224AB38E166E5A660066B1C6 /* KMSManualTests.m */; }; - 224AB393166E5A7A0066B1C6 /* KMSTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 224AB392166E5A7A0066B1C6 /* KMSTestCase.m */; }; - 22662EE7165D219A005FCC4A /* KMSResponseCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 22662EE6165D219A005FCC4A /* KMSResponseCollection.m */; }; - 22662EEF165D2C65005FCC4A /* ftp.json in Resources */ = {isa = PBXBuildFile; fileRef = 22662EED165D2C65005FCC4A /* ftp.json */; }; - 22662EF0165D2C65005FCC4A /* webdav.json in Resources */ = {isa = PBXBuildFile; fileRef = 22662EEE165D2C65005FCC4A /* webdav.json */; }; - 2289BC0516AD63CD007DC402 /* KMSTranscriptEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 2289BC0416AD63CD007DC402 /* KMSTranscriptEntry.m */; }; - 22A6602516B3198300117D24 /* KMSCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602416B3198300117D24 /* KMSCommand.m */; }; - 22A6602816B32B4A00117D24 /* KMSSendDataCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602716B32B4A00117D24 /* KMSSendDataCommand.m */; }; - 22A6602B16B32BA300117D24 /* KMSSendStringCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602A16B32BA300117D24 /* KMSSendStringCommand.m */; }; - 22A6602E16B32BFD00117D24 /* KMSPauseCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602D16B32BFD00117D24 /* KMSPauseCommand.m */; }; - 22A6603116B32C7F00117D24 /* KMSSendServerDataCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6603016B32C7E00117D24 /* KMSSendServerDataCommand.m */; }; - 22A6603416B32EFB00117D24 /* KMSCloseCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6603316B32EFB00117D24 /* KMSCloseCommand.m */; }; - 22BC963B167FB72200144FFE /* http.json in Resources */ = {isa = PBXBuildFile; fileRef = 22BC963A167FB72200144FFE /* http.json */; }; - 22F6D0D8165A5B2400443CC9 /* KMSRegExResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F6D0D7165A5B2400443CC9 /* KMSRegExResponder.m */; }; 3CD748A41B366825009C00C9 /* MockServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CD748A31B366825009C00C9 /* MockServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3CD748AA1B366826009C00C9 /* MockServer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CD7489F1B366825009C00C9 /* MockServer.framework */; }; 3CD748B11B366826009C00C9 /* MockServerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CD748B01B366826009C00C9 /* MockServerTests.m */; }; @@ -52,26 +32,6 @@ 3CD748D51B36693D009C00C9 /* KMSResponseCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 22662EE5165D2199005FCC4A /* KMSResponseCollection.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3CD748D61B36693D009C00C9 /* KMSTestCase.h in Headers */ = {isa = PBXBuildFile; fileRef = 224AB391166E5A7A0066B1C6 /* KMSTestCase.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3CD748D71B36693D009C00C9 /* KMSTranscriptEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = 2289BC0316AD63CD007DC402 /* KMSTranscriptEntry.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 5F53DAED1727B9E800DE6269 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 220AD7991509019B00748655 /* SenTestingKit.framework */; }; - 5F53DAFF1727BAF000DE6269 /* KMSCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602416B3198300117D24 /* KMSCommand.m */; }; - 5F53DB001727BAF000DE6269 /* KMSServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A201164C53F3008D4ADE /* KMSServer.m */; }; - 5F53DB011727BAF000DE6269 /* KMSRegExResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F6D0D7165A5B2400443CC9 /* KMSRegExResponder.m */; }; - 5F53DB021727BAF000DE6269 /* KMSResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A209164C53F3008D4ADE /* KMSResponder.m */; }; - 5F53DB031727BAF000DE6269 /* KMSResponseCollection.m in Sources */ = {isa = PBXBuildFile; fileRef = 22662EE6165D219A005FCC4A /* KMSResponseCollection.m */; }; - 5F53DB041727BAF000DE6269 /* KMSTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 224AB392166E5A7A0066B1C6 /* KMSTestCase.m */; }; - 5F53DB051727BAF000DE6269 /* KMSTranscriptEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 2289BC0416AD63CD007DC402 /* KMSTranscriptEntry.m */; }; - 5F53DB061727BAF000DE6269 /* KMSCloseCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6603316B32EFB00117D24 /* KMSCloseCommand.m */; }; - 5F53DB071727BAF000DE6269 /* KMSPauseCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602D16B32BFD00117D24 /* KMSPauseCommand.m */; }; - 5F53DB081727BAF000DE6269 /* KMSSendDataCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602716B32B4A00117D24 /* KMSSendDataCommand.m */; }; - 5F53DB091727BAF000DE6269 /* KMSSendServerDataCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6603016B32C7E00117D24 /* KMSSendServerDataCommand.m */; }; - 5F53DB0A1727BAF000DE6269 /* KMSSendStringCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602A16B32BA300117D24 /* KMSSendStringCommand.m */; }; - 5F53DB0B1727BAF000DE6269 /* KMSConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A203164C53F3008D4ADE /* KMSConnection.m */; }; - 5F53DB0C1727BAF000DE6269 /* KMSListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A207164C53F3008D4ADE /* KMSListener.m */; }; - 5F53DB0D1727BAF000DE6269 /* KMSCollectionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 224AB38D166E5A660066B1C6 /* KMSCollectionTests.m */; }; - 5F53DB0E1727BAF000DE6269 /* KMSManualTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 224AB38E166E5A660066B1C6 /* KMSManualTests.m */; }; - 5F53DB0F1727BB0D00DE6269 /* http.json in Resources */ = {isa = PBXBuildFile; fileRef = 22BC963A167FB72200144FFE /* http.json */; }; - 5F53DB101727BB0D00DE6269 /* ftp.json in Resources */ = {isa = PBXBuildFile; fileRef = 22662EED165D2C65005FCC4A /* ftp.json */; }; - 5F53DB111727BB0D00DE6269 /* webdav.json in Resources */ = {isa = PBXBuildFile; fileRef = 22662EEE165D2C65005FCC4A /* webdav.json */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -84,20 +44,7 @@ }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - 22FA97F715090855001728B8 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ - 220AD7981509019B00748655 /* UnitTests OSX.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "UnitTests OSX.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; 220AD7991509019B00748655 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; 2239A1FD164C5381008D4ADE /* UnitTest.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = UnitTest.plist; sourceTree = ""; }; 2239A200164C53F3008D4ADE /* KMSServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSServer.h; sourceTree = SOURCE_ROOT; }; @@ -149,19 +96,10 @@ 3CD748A91B366825009C00C9 /* MockServerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MockServerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3CD748AF1B366826009C00C9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3CD748B01B366826009C00C9 /* MockServerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockServerTests.m; sourceTree = ""; }; - 5F53DAEC1727B9E800DE6269 /* UnitTests iOS.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "UnitTests iOS.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; 5F53DAEE1727B9E800DE6269 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 220AD7941509019B00748655 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 220AD79A1509019B00748655 /* SenTestingKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 3CD7489B1B366825009C00C9 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -177,22 +115,12 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 5F53DAE81727B9E800DE6269 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 5F53DAED1727B9E800DE6269 /* SenTestingKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 220AD7981509019B00748655 /* UnitTests OSX.octest */, - 5F53DAEC1727B9E800DE6269 /* UnitTests iOS.octest */, 3CD7489F1B366825009C00C9 /* MockServer.framework */, 3CD748A91B366825009C00C9 /* MockServerTests.xctest */, ); @@ -368,25 +296,6 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 220AD7971509019B00748655 /* UnitTests OSX */ = { - isa = PBXNativeTarget; - buildConfigurationList = 220AD7A71509019B00748655 /* Build configuration list for PBXNativeTarget "UnitTests OSX" */; - buildPhases = ( - 220AD7931509019B00748655 /* Sources */, - 220AD7941509019B00748655 /* Frameworks */, - 220AD7951509019B00748655 /* Resources */, - 22FA97F715090855001728B8 /* CopyFiles */, - 220AD7961509019B00748655 /* ShellScript */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "UnitTests OSX"; - productName = Tests; - productReference = 220AD7981509019B00748655 /* UnitTests OSX.octest */; - productType = "com.apple.product-type.bundle.ocunit-test"; - }; 3CD7489E1B366825009C00C9 /* MockServer */ = { isa = PBXNativeTarget; buildConfigurationList = 3CD748B21B366826009C00C9 /* Build configuration list for PBXNativeTarget "MockServer" */; @@ -423,24 +332,6 @@ productReference = 3CD748A91B366825009C00C9 /* MockServerTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 5F53DAEB1727B9E800DE6269 /* UnitTests iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 5F53DAFE1727B9E800DE6269 /* Build configuration list for PBXNativeTarget "UnitTests iOS" */; - buildPhases = ( - 5F53DAE71727B9E800DE6269 /* Sources */, - 5F53DAE81727B9E800DE6269 /* Frameworks */, - 5F53DAE91727B9E800DE6269 /* Resources */, - 5F53DAEA1727B9E800DE6269 /* ShellScript */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "UnitTests iOS"; - productName = "UnitTests-iOS"; - productReference = 5F53DAEC1727B9E800DE6269 /* UnitTests iOS.octest */; - productType = "com.apple.product-type.bundle.ocunit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -481,8 +372,6 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 220AD7971509019B00748655 /* UnitTests OSX */, - 5F53DAEB1727B9E800DE6269 /* UnitTests iOS */, 3CD7489E1B366825009C00C9 /* MockServer */, 3CD748A81B366825009C00C9 /* MockServerTests */, ); @@ -490,16 +379,6 @@ /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 220AD7951509019B00748655 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 22662EEF165D2C65005FCC4A /* ftp.json in Resources */, - 22662EF0165D2C65005FCC4A /* webdav.json in Resources */, - 22BC963B167FB72200144FFE /* http.json in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 3CD7489D1B366825009C00C9 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -514,73 +393,9 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 5F53DAE91727B9E800DE6269 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 5F53DB0F1727BB0D00DE6269 /* http.json in Resources */, - 5F53DB101727BB0D00DE6269 /* ftp.json in Resources */, - 5F53DB111727BB0D00DE6269 /* webdav.json in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 220AD7961509019B00748655 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; - showEnvVarsInLog = 0; - }; - 5F53DAEA1727B9E800DE6269 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ - 220AD7931509019B00748655 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2239A20A164C53F3008D4ADE /* KMSServer.m in Sources */, - 2239A20B164C53F3008D4ADE /* KMSConnection.m in Sources */, - 2239A20D164C53F3008D4ADE /* KMSListener.m in Sources */, - 2239A20E164C53F3008D4ADE /* KMSResponder.m in Sources */, - 22F6D0D8165A5B2400443CC9 /* KMSRegExResponder.m in Sources */, - 22662EE7165D219A005FCC4A /* KMSResponseCollection.m in Sources */, - 224AB38F166E5A660066B1C6 /* KMSCollectionTests.m in Sources */, - 224AB390166E5A660066B1C6 /* KMSManualTests.m in Sources */, - 224AB393166E5A7A0066B1C6 /* KMSTestCase.m in Sources */, - 2289BC0516AD63CD007DC402 /* KMSTranscriptEntry.m in Sources */, - 22A6602516B3198300117D24 /* KMSCommand.m in Sources */, - 22A6602816B32B4A00117D24 /* KMSSendDataCommand.m in Sources */, - 22A6602B16B32BA300117D24 /* KMSSendStringCommand.m in Sources */, - 22A6602E16B32BFD00117D24 /* KMSPauseCommand.m in Sources */, - 22A6603116B32C7F00117D24 /* KMSSendServerDataCommand.m in Sources */, - 22A6603416B32EFB00117D24 /* KMSCloseCommand.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 3CD7489A1B366825009C00C9 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -610,29 +425,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 5F53DAE71727B9E800DE6269 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 5F53DAFF1727BAF000DE6269 /* KMSCommand.m in Sources */, - 5F53DB001727BAF000DE6269 /* KMSServer.m in Sources */, - 5F53DB011727BAF000DE6269 /* KMSRegExResponder.m in Sources */, - 5F53DB021727BAF000DE6269 /* KMSResponder.m in Sources */, - 5F53DB031727BAF000DE6269 /* KMSResponseCollection.m in Sources */, - 5F53DB041727BAF000DE6269 /* KMSTestCase.m in Sources */, - 5F53DB051727BAF000DE6269 /* KMSTranscriptEntry.m in Sources */, - 5F53DB061727BAF000DE6269 /* KMSCloseCommand.m in Sources */, - 5F53DB071727BAF000DE6269 /* KMSPauseCommand.m in Sources */, - 5F53DB081727BAF000DE6269 /* KMSSendDataCommand.m in Sources */, - 5F53DB091727BAF000DE6269 /* KMSSendServerDataCommand.m in Sources */, - 5F53DB0A1727BAF000DE6269 /* KMSSendStringCommand.m in Sources */, - 5F53DB0B1727BAF000DE6269 /* KMSConnection.m in Sources */, - 5F53DB0C1727BAF000DE6269 /* KMSListener.m in Sources */, - 5F53DB0D1727BAF000DE6269 /* KMSCollectionTests.m in Sources */, - 5F53DB0E1727BAF000DE6269 /* KMSManualTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -644,76 +436,6 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 220AD7A81509019B00748655 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - LD_RUNPATH_SEARCH_PATHS = "\"@loader_path/../Frameworks\""; - MACOSX_DEPLOYMENT_TARGET = 10.7; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = octest; - }; - name = Debug; - }; - 220AD7A91509019B00748655 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - LD_RUNPATH_SEARCH_PATHS = "\"@loader_path/../Frameworks\""; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = octest; - }; - name = Release; - }; - 220AD7AA1509019B00748655 /* Plugin */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_VERSION = com.apple.compilers.llvm.clang.1_0; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - LD_RUNPATH_SEARCH_PATHS = "\"@loader_path/../Frameworks\""; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = octest; - }; - name = Plugin; - }; 3CD748B31B366826009C00C9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -984,93 +706,6 @@ }; name = Plugin; }; - 5F53DAFB1727B9E800DE6269 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "\"$(SDKROOT)/Developer/Library/Frameworks\"", - "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - WRAPPER_EXTENSION = octest; - }; - name = Debug; - }; - 5F53DAFC1727B9E800DE6269 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ( - "\"$(SDKROOT)/Developer/Library/Frameworks\"", - "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - WRAPPER_EXTENSION = octest; - }; - name = Release; - }; - 5F53DAFD1727B9E800DE6269 /* Plugin */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - FRAMEWORK_SEARCH_PATHS = ( - "\"$(SDKROOT)/Developer/Library/Frameworks\"", - "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 5.1; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - WRAPPER_EXTENSION = octest; - }; - name = Plugin; - }; 79A857940B9267CA00D9C844 /* Plugin */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1109,16 +744,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 220AD7A71509019B00748655 /* Build configuration list for PBXNativeTarget "UnitTests OSX" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 220AD7A81509019B00748655 /* Debug */, - 220AD7A91509019B00748655 /* Release */, - 220AD7AA1509019B00748655 /* Plugin */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 3CD748B21B366826009C00C9 /* Build configuration list for PBXNativeTarget "MockServer" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1137,16 +762,6 @@ ); defaultConfigurationIsVisible = 0; }; - 5F53DAFE1727B9E800DE6269 /* Build configuration list for PBXNativeTarget "UnitTests iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 5F53DAFB1727B9E800DE6269 /* Debug */, - 5F53DAFC1727B9E800DE6269 /* Release */, - 5F53DAFD1727B9E800DE6269 /* Plugin */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MockServer" */ = { isa = XCConfigurationList; buildConfigurations = ( From e2b1693094aba9c9ef8081ad6e59de3b46a66cd0 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 20:56:59 -0700 Subject: [PATCH 04/19] remove SenTestingKit --- MockServer.xcodeproj/project.pbxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/MockServer.xcodeproj/project.pbxproj b/MockServer.xcodeproj/project.pbxproj index c38a826..979e182 100644 --- a/MockServer.xcodeproj/project.pbxproj +++ b/MockServer.xcodeproj/project.pbxproj @@ -45,7 +45,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 220AD7991509019B00748655 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; 2239A1FD164C5381008D4ADE /* UnitTest.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = UnitTest.plist; sourceTree = ""; }; 2239A200164C53F3008D4ADE /* KMSServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSServer.h; sourceTree = SOURCE_ROOT; }; 2239A201164C53F3008D4ADE /* KMSServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSServer.m; sourceTree = SOURCE_ROOT; }; @@ -234,7 +233,6 @@ isa = PBXGroup; children = ( 29B97325FDCFA39411CA2CEA /* Foundation.framework */, - 220AD7991509019B00748655 /* SenTestingKit.framework */, 5F53DAEE1727B9E800DE6269 /* UIKit.framework */, ); name = Frameworks; From fc222f22ec734875bda253326584810d97ad3e2d Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 21:00:06 -0700 Subject: [PATCH 05/19] fix up framework header --- MockServer/MockServer.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/MockServer/MockServer.h b/MockServer/MockServer.h index 9519907..63027aa 100644 --- a/MockServer/MockServer.h +++ b/MockServer/MockServer.h @@ -14,6 +14,11 @@ FOUNDATION_EXPORT double MockServerVersionNumber; //! Project version string for MockServer. FOUNDATION_EXPORT const unsigned char MockServerVersionString[]; -// In this header, you should import all the public headers of your framework using statements like #import - - +#import +#import +#import +#import +#import +#import +#import +#import From 8579fa13917bcbb9f0c50fa95aeb48c518aed9c7 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 21:09:26 -0700 Subject: [PATCH 06/19] get rid of the old UnitTest bundle, including crazy Jenkins stuff --- MockServer.xcodeproj/project.pbxproj | 27 +++--------- UnitTests/UnitTest.pch | 10 ----- UnitTests/UnitTest.plist | 20 --------- UnitTests/test.sh | 63 ---------------------------- 4 files changed, 6 insertions(+), 114 deletions(-) delete mode 100644 UnitTests/UnitTest.pch delete mode 100644 UnitTests/UnitTest.plist delete mode 100755 UnitTests/test.sh diff --git a/MockServer.xcodeproj/project.pbxproj b/MockServer.xcodeproj/project.pbxproj index 979e182..cd8da55 100644 --- a/MockServer.xcodeproj/project.pbxproj +++ b/MockServer.xcodeproj/project.pbxproj @@ -45,7 +45,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 2239A1FD164C5381008D4ADE /* UnitTest.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = UnitTest.plist; sourceTree = ""; }; 2239A200164C53F3008D4ADE /* KMSServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSServer.h; sourceTree = SOURCE_ROOT; }; 2239A201164C53F3008D4ADE /* KMSServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSServer.m; sourceTree = SOURCE_ROOT; }; 2239A202164C53F3008D4ADE /* KMSConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSConnection.h; sourceTree = SOURCE_ROOT; }; @@ -55,8 +54,8 @@ 2239A208164C53F3008D4ADE /* KMSResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSResponder.h; sourceTree = SOURCE_ROOT; }; 2239A209164C53F3008D4ADE /* KMSResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSResponder.m; sourceTree = SOURCE_ROOT; }; 2239A216164C5D0A008D4ADE /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = ""; }; - 224AB38D166E5A660066B1C6 /* KMSCollectionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSCollectionTests.m; sourceTree = ""; }; - 224AB38E166E5A660066B1C6 /* KMSManualTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSManualTests.m; sourceTree = ""; }; + 224AB38D166E5A660066B1C6 /* KMSCollectionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KMSCollectionTests.m; path = ../UnitTests/KMSCollectionTests.m; sourceTree = ""; }; + 224AB38E166E5A660066B1C6 /* KMSManualTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KMSManualTests.m; path = ../UnitTests/KMSManualTests.m; sourceTree = ""; }; 224AB391166E5A7A0066B1C6 /* KMSTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSTestCase.h; sourceTree = SOURCE_ROOT; }; 224AB392166E5A7A0066B1C6 /* KMSTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSTestCase.m; sourceTree = SOURCE_ROOT; }; 22662EE5165D2199005FCC4A /* KMSResponseCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSResponseCollection.h; sourceTree = SOURCE_ROOT; }; @@ -64,7 +63,6 @@ 22662EED165D2C65005FCC4A /* ftp.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = ftp.json; sourceTree = ""; }; 22662EEE165D2C65005FCC4A /* webdav.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = webdav.json; sourceTree = ""; }; 227CF8B716709C7B00F28590 /* Logging-template.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Logging-template.md"; sourceTree = ""; }; - 227CF8B916709DC300F28590 /* UnitTest.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnitTest.pch; sourceTree = ""; }; 227CF8C41671001900F28590 /* KMSState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSState.h; sourceTree = SOURCE_ROOT; }; 2289BC0316AD63CD007DC402 /* KMSTranscriptEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSTranscriptEntry.h; sourceTree = SOURCE_ROOT; }; 2289BC0416AD63CD007DC402 /* KMSTranscriptEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSTranscriptEntry.m; sourceTree = SOURCE_ROOT; }; @@ -82,7 +80,6 @@ 22A6603316B32EFB00117D24 /* KMSCloseCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSCloseCommand.m; sourceTree = SOURCE_ROOT; }; 22BC963A167FB72200144FFE /* http.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = http.json; sourceTree = ""; }; 22F4D567165FDCC3003FCEB9 /* Responses-template.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = "Responses-template.md"; sourceTree = ""; }; - 22F4D568165FDED5003FCEB9 /* test.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = test.sh; sourceTree = ""; }; 22F6D0D4165A4A3400443CC9 /* .appledoc.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = .appledoc.plist; path = ../.appledoc.plist; sourceTree = ""; }; 22F6D0D6165A5B2400443CC9 /* KMSRegExResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KMSRegExResponder.h; sourceTree = SOURCE_ROOT; }; 22F6D0D7165A5B2400443CC9 /* KMSRegExResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KMSRegExResponder.m; sourceTree = SOURCE_ROOT; }; @@ -95,7 +92,6 @@ 3CD748A91B366825009C00C9 /* MockServerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MockServerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3CD748AF1B366826009C00C9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3CD748B01B366826009C00C9 /* MockServerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockServerTests.m; sourceTree = ""; }; - 5F53DAEE1727B9E800DE6269 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -126,19 +122,6 @@ name = Products; sourceTree = ""; }; - 2239A1FB164C5381008D4ADE /* UnitTests */ = { - isa = PBXGroup; - children = ( - 22F4D568165FDED5003FCEB9 /* test.sh */, - 224AB38D166E5A660066B1C6 /* KMSCollectionTests.m */, - 224AB38E166E5A660066B1C6 /* KMSManualTests.m */, - 227CF8B916709DC300F28590 /* UnitTest.pch */, - 2239A1FD164C5381008D4ADE /* UnitTest.plist */, - 2262E767165FBFFD004BD4A2 /* Response Files */, - ); - path = UnitTests; - sourceTree = ""; - }; 2262E767165FBFFD004BD4A2 /* Response Files */ = { isa = PBXGroup; children = ( @@ -147,6 +130,7 @@ 22662EEE165D2C65005FCC4A /* webdav.json */, ); name = "Response Files"; + path = ../UnitTests; sourceTree = ""; }; 2262E768165FC38D004BD4A2 /* Internal */ = { @@ -212,7 +196,6 @@ children = ( 22F6D0D9165A65AB00443CC9 /* Documentation */, 22B47C59164AE5EE006E80EB /* MockServer */, - 2239A1FB164C5381008D4ADE /* UnitTests */, 29B97317FDCFA39411CA2CEA /* Resources */, 3CD748A01B366825009C00C9 /* MockServer */, 3CD748AD1B366826009C00C9 /* MockServerTests */, @@ -233,7 +216,6 @@ isa = PBXGroup; children = ( 29B97325FDCFA39411CA2CEA /* Foundation.framework */, - 5F53DAEE1727B9E800DE6269 /* UIKit.framework */, ); name = Frameworks; sourceTree = ""; @@ -259,6 +241,9 @@ isa = PBXGroup; children = ( 3CD748B01B366826009C00C9 /* MockServerTests.m */, + 224AB38D166E5A660066B1C6 /* KMSCollectionTests.m */, + 224AB38E166E5A660066B1C6 /* KMSManualTests.m */, + 2262E767165FBFFD004BD4A2 /* Response Files */, 3CD748AE1B366826009C00C9 /* Supporting Files */, ); path = MockServerTests; diff --git a/UnitTests/UnitTest.pch b/UnitTests/UnitTest.pch deleted file mode 100644 index cbdf4c8..0000000 --- a/UnitTests/UnitTest.pch +++ /dev/null @@ -1,10 +0,0 @@ - -//#define KMSLog(...) do { } while (0) -//#define KMSLogDetail(...) do { } while (0) - -#define KMSLog(...) do { NSString* s = [NSString stringWithFormat:__VA_ARGS__]; NSLog(@"MockServer: %@", s); } while (0) -#define KMSLogDetail KMSLog - -#ifdef __OBJC__ - #import -#endif diff --git a/UnitTests/UnitTest.plist b/UnitTests/UnitTest.plist deleted file mode 100644 index 23e5c12..0000000 --- a/UnitTests/UnitTest.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - com.karelia.MockServerUnitTest - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - BNDL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - - diff --git a/UnitTests/test.sh b/UnitTests/test.sh deleted file mode 100755 index 6106b78..0000000 --- a/UnitTests/test.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/env bash - -# This script builds and runs the unit tests and produces output in a format that is compatible with Jenkins. - -base=`dirname $0` -pushd "$base/.." > /dev/null -build="$PWD/test-build" -ocunit2junit="$base/OCUnit2JUnit/bin/ocunit2junit" -popd > /dev/null - -sym="$build/sym" -obj="$build/obj" - -testout="$build/output.log" -testerr="$build/error.log" - -rm -rf "$build" -mkdir -p "$build" - -testMac() -{ - echo "Testing Mac" - xcodebuild -workspace "MockServer.xcworkspace" -scheme "Unit Tests OS X" -sdk "macosx" -config "Debug" test OBJROOT="$obj" SYMROOT="$sym" > "$testout" 2> "$testerr" - if [ $? != 0 ]; then - echo "Mac build failed" - cat "$testerr" - else - cd "$build" - rm -rf test-reports - "../$ocunit2junit" < "$testout" - mv test-reports mac-reports - cd .. - fi -} - -testIOS() -{ - # have to build the project/target, not the workspace/scheme, since xcodebuild doesn't support - # running unit tests on the ios simulator via workspace/scheme, for some bizarre reason - echo "Testing iOS" - xcodebuild -project "MockServer.xcodeproj" -target "UnitTests iOS" -sdk "iphonesimulator" -arch i386 -config "Debug" build OBJROOT="$obj" SYMROOT="$sym" TEST_AFTER_BUILD=YES > "$testout" 2> "$testerr" - if [ $? != 0 ]; then - echo "iOS build failed" - cat "$testerr" - else - cd "$build" - rm -rf test-reports - "../$ocunit2junit" < "$testout" - mv test-reports ios-reports - cd .. - fi -} - - -testMac -testIOS - -cd "$build" -mkdir test-reports -mv mac-reports test-reports/ -mv ios-reports test-reports/ - - From 0bb485a0f3608cbe12ccc7cf530e75f76f043033 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 21:10:46 -0700 Subject: [PATCH 07/19] delete old schemes, add one for framework --- ...ests OS X.xcscheme => MockServer.xcscheme} | 55 ++++++++++++++----- .../xcschemes/Unit Tests iOS.xcscheme | 53 ------------------ 2 files changed, 41 insertions(+), 67 deletions(-) rename MockServer.xcodeproj/xcshareddata/xcschemes/{Unit Tests OS X.xcscheme => MockServer.xcscheme} (56%) delete mode 100644 MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests iOS.xcscheme diff --git a/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests OS X.xcscheme b/MockServer.xcodeproj/xcshareddata/xcschemes/MockServer.xcscheme similarity index 56% rename from MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests OS X.xcscheme rename to MockServer.xcodeproj/xcshareddata/xcschemes/MockServer.xcscheme index 2c5e19c..6d9427a 100644 --- a/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests OS X.xcscheme +++ b/MockServer.xcodeproj/xcshareddata/xcschemes/MockServer.xcscheme @@ -10,13 +10,27 @@ buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + + + + @@ -32,18 +46,22 @@ skipped = "NO"> - - - - + + + + @@ -72,6 +90,15 @@ useCustomWorkingDirectory = "NO" buildConfiguration = "Release" debugDocumentVersioning = "YES"> + + + + diff --git a/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests iOS.xcscheme b/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests iOS.xcscheme deleted file mode 100644 index 0c5746d..0000000 --- a/MockServer.xcodeproj/xcshareddata/xcschemes/Unit Tests iOS.xcscheme +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - From eede966073af6ed988ecffa29df0d3b9b2fd45b9 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 21:20:32 -0700 Subject: [PATCH 08/19] remove empty Resources group --- MockServer.xcodeproj/project.pbxproj | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/MockServer.xcodeproj/project.pbxproj b/MockServer.xcodeproj/project.pbxproj index cd8da55..23823d8 100644 --- a/MockServer.xcodeproj/project.pbxproj +++ b/MockServer.xcodeproj/project.pbxproj @@ -196,7 +196,6 @@ children = ( 22F6D0D9165A65AB00443CC9 /* Documentation */, 22B47C59164AE5EE006E80EB /* MockServer */, - 29B97317FDCFA39411CA2CEA /* Resources */, 3CD748A01B366825009C00C9 /* MockServer */, 3CD748AD1B366826009C00C9 /* MockServerTests */, 29B97323FDCFA39411CA2CEA /* Frameworks */, @@ -205,13 +204,6 @@ name = Connection; sourceTree = ""; }; - 29B97317FDCFA39411CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - ); - name = Resources; - sourceTree = ""; - }; 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( @@ -735,6 +727,7 @@ 3CD748B51B366826009C00C9 /* Plugin */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 3CD748B61B366826009C00C9 /* Build configuration list for PBXNativeTarget "MockServerTests" */ = { isa = XCConfigurationList; @@ -744,6 +737,7 @@ 3CD748B91B366826009C00C9 /* Plugin */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MockServer" */ = { isa = XCConfigurationList; From a2ab4cdc9d204a6e1844fa7b40a2aa4b4d983add Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 21:21:19 -0700 Subject: [PATCH 09/19] copy json response files to framework resources --- MockServer.xcodeproj/project.pbxproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MockServer.xcodeproj/project.pbxproj b/MockServer.xcodeproj/project.pbxproj index 23823d8..22840cd 100644 --- a/MockServer.xcodeproj/project.pbxproj +++ b/MockServer.xcodeproj/project.pbxproj @@ -7,6 +7,9 @@ objects = { /* Begin PBXBuildFile section */ + 3CBCE6C91B36732300EB5E49 /* http.json in Resources */ = {isa = PBXBuildFile; fileRef = 22BC963A167FB72200144FFE /* http.json */; }; + 3CBCE6CA1B36732300EB5E49 /* ftp.json in Resources */ = {isa = PBXBuildFile; fileRef = 22662EED165D2C65005FCC4A /* ftp.json */; }; + 3CBCE6CB1B36732300EB5E49 /* webdav.json in Resources */ = {isa = PBXBuildFile; fileRef = 22662EEE165D2C65005FCC4A /* webdav.json */; }; 3CD748A41B366825009C00C9 /* MockServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CD748A31B366825009C00C9 /* MockServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3CD748AA1B366826009C00C9 /* MockServer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CD7489F1B366825009C00C9 /* MockServer.framework */; }; 3CD748B11B366826009C00C9 /* MockServerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CD748B01B366826009C00C9 /* MockServerTests.m */; }; @@ -358,6 +361,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3CBCE6C91B36732300EB5E49 /* http.json in Resources */, + 3CBCE6CA1B36732300EB5E49 /* ftp.json in Resources */, + 3CBCE6CB1B36732300EB5E49 /* webdav.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; From 2e0eeccf565be9299e52d1593d93537f07544c83 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 21:25:48 -0700 Subject: [PATCH 10/19] fix FRAMEWORK_SEARCH_PATHS so KMSTestCase can exist outside of test target --- MockServer.xcodeproj/project.pbxproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MockServer.xcodeproj/project.pbxproj b/MockServer.xcodeproj/project.pbxproj index 22840cd..3710124 100644 --- a/MockServer.xcodeproj/project.pbxproj +++ b/MockServer.xcodeproj/project.pbxproj @@ -443,6 +443,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -496,6 +497,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; @@ -542,6 +544,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = "$(PLATFORM_DIR)/Developer/Library/Frameworks"; FRAMEWORK_VERSION = A; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; From f0353028d963d65c56d7a100d4f7cbb83dc17617 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 21:27:10 -0700 Subject: [PATCH 11/19] more with the ARCing --- KMSTestCase.m | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/KMSTestCase.m b/KMSTestCase.m index 79d6a96..e29f321 100644 --- a/KMSTestCase.m +++ b/KMSTestCase.m @@ -10,17 +10,6 @@ @implementation KMSTestCase -- (void)dealloc -{ - [_password release]; - [_responses release]; - [_server release]; - [_url release]; - [_user release]; - - [super dealloc]; -} - - (void)tearDown { [self cleanupServer]; @@ -104,7 +93,7 @@ - (NSString*)stringForRequest:(NSURLRequest*)request [self runUntilPaused]; - return [string autorelease]; + return string; } - (void)runUntilPaused From 69d692c32de509f5c29da2be929584838db4282c Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 21:33:38 -0700 Subject: [PATCH 12/19] fix up internal header --- KMSSendStringCommand.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KMSSendStringCommand.h b/KMSSendStringCommand.h index 481a100..8d62e68 100644 --- a/KMSSendStringCommand.h +++ b/KMSSendStringCommand.h @@ -6,7 +6,7 @@ // Copyright (c) 2013 Karelia Software. All rights reserved. // -#import "KMSCommand.h" +#import /** Command which sends a string down the connection. From 97efbc8288431c5729c5a8233d188fd9d63e1d67 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 21:33:50 -0700 Subject: [PATCH 13/19] move test classes into test target --- MockServer.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/MockServer.xcodeproj/project.pbxproj b/MockServer.xcodeproj/project.pbxproj index 3710124..912cb44 100644 --- a/MockServer.xcodeproj/project.pbxproj +++ b/MockServer.xcodeproj/project.pbxproj @@ -10,6 +10,8 @@ 3CBCE6C91B36732300EB5E49 /* http.json in Resources */ = {isa = PBXBuildFile; fileRef = 22BC963A167FB72200144FFE /* http.json */; }; 3CBCE6CA1B36732300EB5E49 /* ftp.json in Resources */ = {isa = PBXBuildFile; fileRef = 22662EED165D2C65005FCC4A /* ftp.json */; }; 3CBCE6CB1B36732300EB5E49 /* webdav.json in Resources */ = {isa = PBXBuildFile; fileRef = 22662EEE165D2C65005FCC4A /* webdav.json */; }; + 3CBCE6CC1B36754E00EB5E49 /* KMSCollectionTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 224AB38D166E5A660066B1C6 /* KMSCollectionTests.m */; }; + 3CBCE6CD1B36754E00EB5E49 /* KMSManualTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 224AB38E166E5A660066B1C6 /* KMSManualTests.m */; }; 3CD748A41B366825009C00C9 /* MockServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CD748A31B366825009C00C9 /* MockServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3CD748AA1B366826009C00C9 /* MockServer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CD7489F1B366825009C00C9 /* MockServer.framework */; }; 3CD748B11B366826009C00C9 /* MockServerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CD748B01B366826009C00C9 /* MockServerTests.m */; }; @@ -402,6 +404,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3CBCE6CC1B36754E00EB5E49 /* KMSCollectionTests.m in Sources */, + 3CBCE6CD1B36754E00EB5E49 /* KMSManualTests.m in Sources */, 3CD748B11B366826009C00C9 /* MockServerTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; From 6b4677c63ca07d272f2bf970c9d56456fe85ad5a Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 21:33:59 -0700 Subject: [PATCH 14/19] ARCify --- UnitTests/KMSManualTests.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitTests/KMSManualTests.m b/UnitTests/KMSManualTests.m index b256112..5fee1d6 100644 --- a/UnitTests/KMSManualTests.m +++ b/UnitTests/KMSManualTests.m @@ -82,7 +82,7 @@ - (NSString*)stringForRequest:(NSURLRequest*)request server:(KMSServer*)server [server runUntilPaused]; - return [string autorelease]; + return string; } #pragma mark - Tests From d3226b2ab9f7eb72834fe5c29d2d29d1496fe6f4 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 21:41:05 -0700 Subject: [PATCH 15/19] remove Xcode generated test class --- MockServer.xcodeproj/project.pbxproj | 4 --- MockServerTests/MockServerTests.m | 40 ---------------------------- 2 files changed, 44 deletions(-) delete mode 100644 MockServerTests/MockServerTests.m diff --git a/MockServer.xcodeproj/project.pbxproj b/MockServer.xcodeproj/project.pbxproj index 912cb44..a6643a8 100644 --- a/MockServer.xcodeproj/project.pbxproj +++ b/MockServer.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 3CBCE6CD1B36754E00EB5E49 /* KMSManualTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 224AB38E166E5A660066B1C6 /* KMSManualTests.m */; }; 3CD748A41B366825009C00C9 /* MockServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CD748A31B366825009C00C9 /* MockServer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3CD748AA1B366826009C00C9 /* MockServer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CD7489F1B366825009C00C9 /* MockServer.framework */; }; - 3CD748B11B366826009C00C9 /* MockServerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CD748B01B366826009C00C9 /* MockServerTests.m */; }; 3CD748BB1B36687F009C00C9 /* KMSCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A6602416B3198300117D24 /* KMSCommand.m */; }; 3CD748BD1B36687F009C00C9 /* KMSServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 2239A201164C53F3008D4ADE /* KMSServer.m */; }; 3CD748C01B36687F009C00C9 /* KMSRegExResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F6D0D7165A5B2400443CC9 /* KMSRegExResponder.m */; }; @@ -96,7 +95,6 @@ 3CD748A31B366825009C00C9 /* MockServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockServer.h; sourceTree = ""; }; 3CD748A91B366825009C00C9 /* MockServerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MockServerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3CD748AF1B366826009C00C9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 3CD748B01B366826009C00C9 /* MockServerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockServerTests.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -237,7 +235,6 @@ 3CD748AD1B366826009C00C9 /* MockServerTests */ = { isa = PBXGroup; children = ( - 3CD748B01B366826009C00C9 /* MockServerTests.m */, 224AB38D166E5A660066B1C6 /* KMSCollectionTests.m */, 224AB38E166E5A660066B1C6 /* KMSManualTests.m */, 2262E767165FBFFD004BD4A2 /* Response Files */, @@ -406,7 +403,6 @@ files = ( 3CBCE6CC1B36754E00EB5E49 /* KMSCollectionTests.m in Sources */, 3CBCE6CD1B36754E00EB5E49 /* KMSManualTests.m in Sources */, - 3CD748B11B366826009C00C9 /* MockServerTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/MockServerTests/MockServerTests.m b/MockServerTests/MockServerTests.m deleted file mode 100644 index 8bf243f..0000000 --- a/MockServerTests/MockServerTests.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// MockServerTests.m -// MockServerTests -// -// Created by Terrence Talbot on 6/20/15. -// Copyright (c) 2015 Karelia Software. All rights reserved. -// - -#import -#import - -@interface MockServerTests : XCTestCase - -@end - -@implementation MockServerTests - -- (void)setUp { - [super setUp]; - // Put setup code here. This method is called before the invocation of each test method in the class. -} - -- (void)tearDown { - // Put teardown code here. This method is called after the invocation of each test method in the class. - [super tearDown]; -} - -- (void)testExample { - // This is an example of a functional test case. - XCTAssert(YES, @"Pass"); -} - -- (void)testPerformanceExample { - // This is an example of a performance test case. - [self measureBlock:^{ - // Put the code you want to measure the time of here. - }]; -} - -@end From ad23b6fc31f9801d5c28a86667c06d87a0468970 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Sat, 20 Jun 2015 21:51:15 -0700 Subject: [PATCH 16/19] eliminate redundant grouping --- MockServer.xcodeproj/project.pbxproj | 42 +++++++++++----------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/MockServer.xcodeproj/project.pbxproj b/MockServer.xcodeproj/project.pbxproj index a6643a8..6246883 100644 --- a/MockServer.xcodeproj/project.pbxproj +++ b/MockServer.xcodeproj/project.pbxproj @@ -155,30 +155,7 @@ 2239A207164C53F3008D4ADE /* KMSListener.m */, ); name = Internal; - sourceTree = ""; - }; - 22B47C59164AE5EE006E80EB /* MockServer */ = { - isa = PBXGroup; - children = ( - 22A6602316B3198300117D24 /* KMSCommand.h */, - 22A6602416B3198300117D24 /* KMSCommand.m */, - 2239A200164C53F3008D4ADE /* KMSServer.h */, - 2239A201164C53F3008D4ADE /* KMSServer.m */, - 227CF8C41671001900F28590 /* KMSState.h */, - 22F6D0D6165A5B2400443CC9 /* KMSRegExResponder.h */, - 22F6D0D7165A5B2400443CC9 /* KMSRegExResponder.m */, - 2239A208164C53F3008D4ADE /* KMSResponder.h */, - 2239A209164C53F3008D4ADE /* KMSResponder.m */, - 22662EE5165D2199005FCC4A /* KMSResponseCollection.h */, - 22662EE6165D219A005FCC4A /* KMSResponseCollection.m */, - 224AB391166E5A7A0066B1C6 /* KMSTestCase.h */, - 224AB392166E5A7A0066B1C6 /* KMSTestCase.m */, - 2289BC0316AD63CD007DC402 /* KMSTranscriptEntry.h */, - 2289BC0416AD63CD007DC402 /* KMSTranscriptEntry.m */, - 2262E768165FC38D004BD4A2 /* Internal */, - ); - name = MockServer; - path = "unit test"; + path = "../unit test"; sourceTree = ""; }; 22F6D0D9165A65AB00443CC9 /* Documentation */ = { @@ -198,7 +175,6 @@ isa = PBXGroup; children = ( 22F6D0D9165A65AB00443CC9 /* Documentation */, - 22B47C59164AE5EE006E80EB /* MockServer */, 3CD748A01B366825009C00C9 /* MockServer */, 3CD748AD1B366826009C00C9 /* MockServerTests */, 29B97323FDCFA39411CA2CEA /* Frameworks */, @@ -219,6 +195,22 @@ isa = PBXGroup; children = ( 3CD748A31B366825009C00C9 /* MockServer.h */, + 22A6602316B3198300117D24 /* KMSCommand.h */, + 22A6602416B3198300117D24 /* KMSCommand.m */, + 2239A200164C53F3008D4ADE /* KMSServer.h */, + 2239A201164C53F3008D4ADE /* KMSServer.m */, + 227CF8C41671001900F28590 /* KMSState.h */, + 22F6D0D6165A5B2400443CC9 /* KMSRegExResponder.h */, + 22F6D0D7165A5B2400443CC9 /* KMSRegExResponder.m */, + 2239A208164C53F3008D4ADE /* KMSResponder.h */, + 2239A209164C53F3008D4ADE /* KMSResponder.m */, + 22662EE5165D2199005FCC4A /* KMSResponseCollection.h */, + 22662EE6165D219A005FCC4A /* KMSResponseCollection.m */, + 224AB391166E5A7A0066B1C6 /* KMSTestCase.h */, + 224AB392166E5A7A0066B1C6 /* KMSTestCase.m */, + 2289BC0316AD63CD007DC402 /* KMSTranscriptEntry.h */, + 2289BC0416AD63CD007DC402 /* KMSTranscriptEntry.m */, + 2262E768165FC38D004BD4A2 /* Internal */, 3CD748A11B366825009C00C9 /* Supporting Files */, ); path = MockServer; From 7f8e6c5bcdf623dd54b6a27d91a9827d5391ea13 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 22 Jun 2015 11:02:37 -0700 Subject: [PATCH 17/19] let's hang onto the queue --- KMSServer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/KMSServer.h b/KMSServer.h index 4cf039a..0aa17c8 100644 --- a/KMSServer.h +++ b/KMSServer.h @@ -63,7 +63,7 @@ typedef NS_ENUM(NSUInteger, KMSLogLevel) @property (readonly, nonatomic) NSUInteger port; -@property (assign, nonatomic) dispatch_queue_t queue; +@property (retain, nonatomic) dispatch_queue_t queue; /** YES if the server is running. NO if the stop method has been called. From 9e18d409e48c6da95203b0fc4b372b0a922f7054 Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Mon, 22 Jun 2015 11:05:54 -0700 Subject: [PATCH 18/19] ARC fixes --- KMSConnection.m | 4 ++-- KMSServer.m | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/KMSConnection.m b/KMSConnection.m index 9855a55..561c287 100644 --- a/KMSConnection.m +++ b/KMSConnection.m @@ -62,8 +62,8 @@ - (id)initWithSocket:(int)socket responder:(KMSResponder*)responder server:(KMSS CFStreamCreatePairWithSocket(NULL, socket, &readStream, &writeStream); self.socket = socket; - self.input = [self setupStream:(NSStream*)CFBridgingRelease(readStream) mode:InputRunMode]; - self.output = [self setupStream:(NSStream*)CFBridgingRelease(writeStream) mode:OutputRunMode]; + self.input = [self setupStream:(__bridge NSInputStream*)readStream mode:InputRunMode]; + self.output = [self setupStream:(__bridge NSOutputStream*)writeStream mode:OutputRunMode]; CFRelease(readStream); CFRelease(writeStream); diff --git a/KMSServer.m b/KMSServer.m index b6232ca..440a350 100644 --- a/KMSServer.m +++ b/KMSServer.m @@ -72,7 +72,8 @@ - (id)initWithPort:(NSUInteger)port responder:(KMSResponder*)responder { dispatch_queue_t queue = dispatch_queue_create("com.karelia.mockserver", 0); self.queue = queue; - dispatch_queue_set_specific(queue, &queueIdentifierKey, (__bridge void *)(self), NULL); + dispatch_queue_set_specific(queue, &queueIdentifierKey, (void *)CFBridgingRetain(self), NULL); + self.responder = responder; self.connections = [NSMutableArray array]; self.transcript = [NSMutableArray array]; From 22213fc81f4cdcac1a39f6ad7a75992cdce3d81f Mon Sep 17 00:00:00 2001 From: Terrence Talbot Date: Tue, 23 Jun 2015 12:01:27 -0700 Subject: [PATCH 19/19] fix bundle identifiers --- MockServer/Info.plist | 2 +- MockServerTests/Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MockServer/Info.plist b/MockServer/Info.plist index 5b9ba69..77cc4ab 100644 --- a/MockServer/Info.plist +++ b/MockServer/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - org.karelia.$(PRODUCT_NAME:rfc1034identifier) + com.karelia.$(PRODUCT_NAME:rfc1034identifier) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/MockServerTests/Info.plist b/MockServerTests/Info.plist index eb32fa5..d770c5a 100644 --- a/MockServerTests/Info.plist +++ b/MockServerTests/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - org.karelia.$(PRODUCT_NAME:rfc1034identifier) + com.karelia.$(PRODUCT_NAME:rfc1034identifier) CFBundleInfoDictionaryVersion 6.0 CFBundleName