Mike Lewis 13 жил өмнө
parent
commit
9deb78ff0a

+ 0 - 23
SRTests/SRTAppDelegate.h

@@ -1,23 +0,0 @@
-//
-//   Copyright 2012 Square Inc.
-//
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface SRTAppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@end

+ 0 - 209
SRTests/SRTAppDelegate.m

@@ -1,209 +0,0 @@
-//
-//   Copyright 2012 Square Inc.
-//
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
-//
-
-#import "SRTAppDelegate.h"
-#import "SRWebSocket.h"
-
-#define SRLogDebug(format, ...) //NSLog(format, __VA_ARGS__)
-
-@interface TestOperation : NSOperation <SRWebSocketDelegate>
-
-- (id)initWithTestNumber:(NSInteger)testNumber;
-
-@end
-
-
-@interface SRTAppDelegate () <SRWebSocketDelegate>
-
-@end
-
-
-@implementation SRTAppDelegate {
-    SRWebSocket *_curWebSocket; 
-    NSInteger _testCount;
-    NSInteger _curTest;
-    NSMutableArray *_sockets;
-}
-
-@synthesize window = _window;
-
-//- (void)_getTests
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-    // Override point for customization after application launch.
-    self.window.backgroundColor = [UIColor whiteColor];
-    [self.window makeKeyAndVisible];
-        
-    _sockets = [[NSMutableArray alloc] init];
-    
-#if 1
-    __unsafe_unretained SRTAppDelegate *weakself = self;
-    _curWebSocket = [[SRWebSocket alloc] initWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"wss://mcnugget.local:443/getCaseCount"]]];
-    _curWebSocket.onMessage = ^(SRWebSocket *webSocket, NSString *message) {
-        NSOperation *finishOperation = [NSBlockOperation blockOperationWithBlock:^{
-            weakself->_curWebSocket = [[SRWebSocket alloc] initWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"wss://mcnugget.local:443/updateReports?agent=socketrocket1"]]];
-            
-            NSLog(@"-- Updating Reports");
-            weakself->_curWebSocket.onClose = ^(SRWebSocket *webSocket, NSInteger code, NSString *reason, BOOL wasClean) {
-                NSLog(@"-- reports updated... exiting");
-            };
-            weakself->_curWebSocket.onError = ^(SRWebSocket *webSocket, NSError *error) {
-                NSLog(@"Error updating reports %@", error.localizedDescription);
-            };
-            
-            [weakself->_curWebSocket open];
-        }];
-
-        
-        NSOperationQueue *testQueue = [[NSOperationQueue alloc] init];
-        testQueue.maxConcurrentOperationCount = 1;
-        
-        for (int i = 0; i < [message integerValue]; i++) {
-            NSOperation *op = [[TestOperation alloc] initWithTestNumber:i + 1];
-            [finishOperation addDependency:op];
-            [testQueue addOperation:op];
-        }
-        
-        [testQueue addOperation:finishOperation];
-    };
-    
-    [_curWebSocket open];
-    
-#else
-    double delayInSeconds = 0.1;
-    dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, delayInSeconds * NSEC_PER_SEC);
-    dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
-        _listener = [[SRWebSocketListener alloc] init];
-
-        _listener.onMessage = ^(SRWebSocket *socket, id message) {
-            [socket send:message];
- 
-#if 0
-            if ([message isKindOfClass:[NSString class]]) {
-                NSLog(@"Echoing String for  %@", [message substringToIndex:MIN(128, [message length])]);
-            } else {
-                NSLog(@"Echoing String for  %@", [message subdataWithRange:NSMakeRange(0, MIN(128, [message length]))]);
-            }
-#endif
-
-        };
-        _listener.onClose = ^(SRWebSocket *webSocket, NSInteger code, NSString *reason, BOOL wasClean) {
-            NSLog(@"closing");
-        };
-        _listener.onError = ^(SRWebSocket *webSocket, NSError *error) {
-            NSLog(@"error %@", error.localizedDescription);
-        };
-        
-        [_listener startListeningOnPort:9000];
-
-    });
-    
-#endif
-    
-    return YES;
-}
-
-@end
-
-@interface TestOperation ()
-
-@property (nonatomic) BOOL isFinished;
-@property (nonatomic) BOOL isExecuting;
-
-@end
-
-@implementation TestOperation {
-    NSInteger _testNumber;
-    SRWebSocket *_webSocket;
-}
-
-@synthesize isFinished = _isFinished;
-@synthesize isExecuting = _isExecuting;
-
-- (id)initWithTestNumber:(NSInteger)testNumber;
-{
-    self = [super init];
-    if (self) {
-        _testNumber = testNumber;
-        _isExecuting = NO;
-        _isFinished = NO;
-    }
-    return self;
-}
-
-- (BOOL)isConcurrent;
-{
-    return YES;
-}
-
-- (void)start;
-{
-    NSLog(@"Starting test %d", _testNumber);
-    self.isExecuting = YES;
-    dispatch_async(dispatch_get_main_queue(), ^{
-        _webSocket = [[SRWebSocket alloc] initWithURLRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"ws://localhost:9001/runCase?case=%d&agent=socketrocket1", _testNumber]]]];
-        _webSocket.delegate = self;
-        [_webSocket open];
-    });
-}
-
-- (void)webSocket:(SRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean;
-{
-    NSLog(@"Received close for %d  (%d, %@)", _testNumber, code, reason);
-    
-    [self willChangeValueForKey:@"isExecuting"];
-    [self willChangeValueForKey:@"isFinished"];
-    _isFinished = YES;
-    _isExecuting = NO;
-    _webSocket = nil;
-    [self didChangeValueForKey:@"isExecuting"];
-    [self didChangeValueForKey:@"isFinished"];
-}
-
-- (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(NSString *)message;
-{
-    if ([message isKindOfClass:[NSString class]]) {
-        SRLogDebug(@"Echoing String for %d %@", _testNumber, [message substringToIndex:MIN(128, [message length])]);
-    } else {
-        SRLogDebug(@"Echoing String for %d %@", _testNumber, [message subd:MIN(128, [message length])]);
-    }
-    [webSocket send:message];
-    
-    double delayInSeconds = 30.0;
-    dispatch_time_t popTime = dispatch_time(DISPATCH_TIME_NOW, delayInSeconds * NSEC_PER_SEC);
-    dispatch_after(popTime, dispatch_get_main_queue(), ^(void){
-        if (!self.isFinished) {
-            NSLog(@"Timing Out");
-            [_webSocket closeWithCode:0 reason:nil];
-        }
-    });
-}
-
-- (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error;
-{
-    NSLog(@"failed with error %@", [error localizedDescription]);            
-    [self willChangeValueForKey:@"isExecuting"];
-    [self willChangeValueForKey:@"isFinished"];
-    _isFinished = YES;
-    _isExecuting = NO;
-    _webSocket = nil;
-    [self didChangeValueForKey:@"isExecuting"];
-    [self didChangeValueForKey:@"isFinished"];
-}
-
-@end

+ 0 - 47
SRTests/SRTests-Info.plist

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFiles</key>
-	<array/>
-	<key>CFBundleIdentifier</key>
-	<string>org.lolrus.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>

+ 0 - 35
SRTests/SRTests-Prefix.pch

@@ -1,35 +0,0 @@
-//
-//   Copyright 2012 Square Inc.
-//
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
-//
-
-#import <Availability.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __IPHONE_3_0
-#warning "This project uses features only available in iOS SDK 3.0 and later."
-#endif
-
-#ifdef __OBJC__
-    #import <UIKit/UIKit.h>
-    #import <Foundation/Foundation.h>
-#endif
-    
-#ifdef __cplusplus
-}
-#endif
-

+ 0 - 2
SRTests/en.lproj/InfoPlist.strings

@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-

+ 0 - 26
SRTests/main.m

@@ -1,26 +0,0 @@
-//
-//   Copyright 2012 Square Inc.
-//
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   you may not use this file except in compliance with the License.
-//   You may obtain a copy of the License at
-//
-//       http://www.apache.org/licenses/LICENSE-2.0
-//
-//   Unless required by applicable law or agreed to in writing, software
-//   distributed under the License is distributed on an "AS IS" BASIS,
-//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//   See the License for the specific language governing permissions and
-//   limitations under the License.
-//
-
-#import <UIKit/UIKit.h>
-
-#import "SRTAppDelegate.h"
-
-int main(int argc, char *argv[])
-{
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([SRTAppDelegate class]));
-    }
-}

+ 1 - 1
SRWebSocketTests/SRTAutobahnTests.m

@@ -93,7 +93,7 @@
     
     NSOperationQueue *testQueue = [[NSOperationQueue alloc] init];
     
-    testQueue.maxConcurrentOperationCount = 1;
+    testQueue.maxConcurrentOperationCount = 8;
     
     NSString *agent = [NSBundle bundleForClass:[self class]].bundleIdentifier;
     

+ 1 - 1
SRWebSocketTests/SRWebSocketTests-Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.lolrus.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>com.squareup.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

+ 0 - 154
SocketRocket.xcodeproj/project.pbxproj

@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		F6016C7C146124B20037BB3D /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = F6016C7B146124B20037BB3D /* base64.c */; };
 		F6016C7F146124ED0037BB3D /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = F6016C7E146124ED0037BB3D /* base64.h */; };
-		F6016C8714620EC60037BB3D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6A12CD3145122FC00C1D980 /* Security.framework */; };
 		F6016C8814620EC70037BB3D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6A12CD3145122FC00C1D980 /* Security.framework */; };
 		F6016C8914620ECC0037BB3D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6A12CD3145122FC00C1D980 /* Security.framework */; };
 		F6016C8A1462143C0037BB3D /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6A12CD51451231B00C1D980 /* CFNetwork.framework */; };
@@ -17,10 +16,8 @@
 		F611322A14D4C4F2008A42D5 /* SRTBonjourLocatorOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = F611322814D4C4F2008A42D5 /* SRTBonjourLocatorOperation.h */; };
 		F611322B14D4C4F2008A42D5 /* SRTBonjourLocatorOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = F611322914D4C4F2008A42D5 /* SRTBonjourLocatorOperation.m */; };
 		F6572126146C7B6A00D6B8A9 /* NSData+SRB64Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = F6572124146C7B6A00D6B8A9 /* NSData+SRB64Additions.m */; };
-		F66996FE146759FE0014B93E /* libSocketRocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F6B2082D1450F597009315AF /* libSocketRocket.a */; };
 		F6A12CD1145119B700C1D980 /* SRWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = F6A12CCF145119B700C1D980 /* SRWebSocket.h */; };
 		F6A12CD2145119B700C1D980 /* SRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = F6A12CD0145119B700C1D980 /* SRWebSocket.m */; };
-		F6A12CD61451231B00C1D980 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6A12CD51451231B00C1D980 /* CFNetwork.framework */; };
 		F6AE451D145906A70022AF3C /* libSocketRocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F6B2082D1450F597009315AF /* libSocketRocket.a */; };
 		F6AE4520145906B20022AF3C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6B208301450F597009315AF /* Foundation.framework */; };
 		F6AE4521145906B20022AF3C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6B208431450F611009315AF /* UIKit.framework */; };
@@ -28,12 +25,6 @@
 		F6AE4523145906C10022AF3C /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6B208461450F611009315AF /* CoreGraphics.framework */; };
 		F6AE45241459071C0022AF3C /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6A12CD51451231B00C1D980 /* CFNetwork.framework */; };
 		F6AE4528145907D30022AF3C /* SenTestCase+SRTAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = F6AE4527145907D30022AF3C /* SenTestCase+SRTAdditions.m */; };
-		F6B208441450F611009315AF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6B208431450F611009315AF /* UIKit.framework */; };
-		F6B208451450F611009315AF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6B208301450F597009315AF /* Foundation.framework */; };
-		F6B208471450F611009315AF /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6B208461450F611009315AF /* CoreGraphics.framework */; };
-		F6B2084D1450F611009315AF /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F6B2084B1450F611009315AF /* InfoPlist.strings */; };
-		F6B2084F1450F611009315AF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F6B2084E1450F611009315AF /* main.m */; };
-		F6B208531450F611009315AF /* SRTAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F6B208521450F611009315AF /* SRTAppDelegate.m */; };
 		F6BDA804145900D200FE3253 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BDA803145900D200FE3253 /* SenTestingKit.framework */; };
 		F6BDA805145900D200FE3253 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6B208431450F611009315AF /* UIKit.framework */; };
 		F6BDA806145900D200FE3253 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6B208301450F597009315AF /* Foundation.framework */; };
@@ -41,7 +32,6 @@
 		F6BDA8161459016900FE3253 /* SRTAutobahnTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F6BDA8151459016900FE3253 /* SRTAutobahnTests.m */; };
 		F6C41C96145F7C4700641356 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6C41C95145F7C4700641356 /* libicucore.dylib */; };
 		F6C41C98145F7C6100641356 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6C41C95145F7C4700641356 /* libicucore.dylib */; };
-		F6C41C99145F7C7700641356 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6C41C95145F7C4700641356 /* libicucore.dylib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -62,15 +52,8 @@
 		F6B2082D1450F597009315AF /* libSocketRocket.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSocketRocket.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		F6B208301450F597009315AF /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		F6B208341450F597009315AF /* SocketRocket-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SocketRocket-Prefix.pch"; sourceTree = "<group>"; };
-		F6B208411450F611009315AF /* SRTests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SRTests.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F6B208431450F611009315AF /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		F6B208461450F611009315AF /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		F6B2084A1450F611009315AF /* SRTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SRTests-Info.plist"; sourceTree = "<group>"; };
-		F6B2084C1450F611009315AF /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		F6B2084E1450F611009315AF /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		F6B208501450F611009315AF /* SRTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SRTests-Prefix.pch"; sourceTree = "<group>"; };
-		F6B208511450F611009315AF /* SRTAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SRTAppDelegate.h; sourceTree = "<group>"; };
-		F6B208521450F611009315AF /* SRTAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SRTAppDelegate.m; sourceTree = "<group>"; };
 		F6BDA802145900D200FE3253 /* SRWebSocketTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SRWebSocketTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
 		F6BDA803145900D200FE3253 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
 		F6BDA809145900D200FE3253 /* SRWebSocketTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SRWebSocketTests-Info.plist"; sourceTree = "<group>"; };
@@ -94,20 +77,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		F6B2083E1450F611009315AF /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F6C41C99145F7C7700641356 /* libicucore.dylib in Frameworks */,
-				F6A12CD61451231B00C1D980 /* CFNetwork.framework in Frameworks */,
-				F6B208441450F611009315AF /* UIKit.framework in Frameworks */,
-				F6B208451450F611009315AF /* Foundation.framework in Frameworks */,
-				F6B208471450F611009315AF /* CoreGraphics.framework in Frameworks */,
-				F6016C8714620EC60037BB3D /* Security.framework in Frameworks */,
-				F66996FE146759FE0014B93E /* libSocketRocket.a in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		F6BDA7FE145900D200FE3253 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -130,7 +99,6 @@
 			isa = PBXGroup;
 			children = (
 				F6B208321450F597009315AF /* SocketRocket */,
-				F6B208481450F611009315AF /* SRTests */,
 				F6BDA807145900D200FE3253 /* SRWebSocketTests */,
 				F6B2082F1450F597009315AF /* Frameworks */,
 				F6B2082E1450F597009315AF /* Products */,
@@ -141,7 +109,6 @@
 			isa = PBXGroup;
 			children = (
 				F6B2082D1450F597009315AF /* libSocketRocket.a */,
-				F6B208411450F611009315AF /* SRTests.app */,
 				F6BDA802145900D200FE3253 /* SRWebSocketTests.octest */,
 			);
 			name = Products;
@@ -183,27 +150,6 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		F6B208481450F611009315AF /* SRTests */ = {
-			isa = PBXGroup;
-			children = (
-				F6B208511450F611009315AF /* SRTAppDelegate.h */,
-				F6B208521450F611009315AF /* SRTAppDelegate.m */,
-				F6B208491450F611009315AF /* Supporting Files */,
-			);
-			path = SRTests;
-			sourceTree = "<group>";
-		};
-		F6B208491450F611009315AF /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				F6B2084A1450F611009315AF /* SRTests-Info.plist */,
-				F6B2084B1450F611009315AF /* InfoPlist.strings */,
-				F6B2084E1450F611009315AF /* main.m */,
-				F6B208501450F611009315AF /* SRTests-Prefix.pch */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		F6BDA807145900D200FE3253 /* SRWebSocketTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -262,23 +208,6 @@
 			productReference = F6B2082D1450F597009315AF /* libSocketRocket.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		F6B208401450F611009315AF /* SRTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = F6B208541450F611009315AF /* Build configuration list for PBXNativeTarget "SRTests" */;
-			buildPhases = (
-				F6B2083D1450F611009315AF /* Sources */,
-				F6B2083E1450F611009315AF /* Frameworks */,
-				F6B2083F1450F611009315AF /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = SRTests;
-			productName = SRTests;
-			productReference = F6B208411450F611009315AF /* SRTests.app */;
-			productType = "com.apple.product-type.application";
-		};
 		F6BDA801145900D200FE3253 /* SRWebSocketTests */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = F6BDA813145900D200FE3253 /* Build configuration list for PBXNativeTarget "SRWebSocketTests" */;
@@ -318,21 +247,12 @@
 			projectRoot = "";
 			targets = (
 				F6B2082C1450F597009315AF /* SocketRocket */,
-				F6B208401450F611009315AF /* SRTests */,
 				F6BDA801145900D200FE3253 /* SRWebSocketTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		F6B2083F1450F611009315AF /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F6B2084D1450F611009315AF /* InfoPlist.strings in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		F6BDA7FF145900D200FE3253 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -371,15 +291,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		F6B2083D1450F611009315AF /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F6B2084F1450F611009315AF /* main.m in Sources */,
-				F6B208531450F611009315AF /* SRTAppDelegate.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		F6BDA7FD145900D200FE3253 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -393,14 +304,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-		F6B2084B1450F611009315AF /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				F6B2084C1450F611009315AF /* en */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
 		F6BDA80A145900D200FE3253 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -492,54 +395,6 @@
 			};
 			name = Release;
 		};
-		F6B208551450F611009315AF /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk/System/Library/Frameworks\"",
-				);
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "SRTests/SRTests-Prefix.pch";
-				INFOPLIST_FILE = "SRTests/SRTests-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = /Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk/usr/lib/system\"",
-					"\"$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk/usr/lib\"",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Debug;
-		};
-		F6B208561450F611009315AF /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_ARC = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk/System/Library/Frameworks\"",
-				);
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "SRTests/SRTests-Prefix.pch";
-				INFOPLIST_FILE = "SRTests/SRTests-Info.plist";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk/usr/lib/system\"",
-					"\"$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator5.0.sdk/usr/lib\"",
-				);
-				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
 		F6BDA811145900D200FE3253 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -603,15 +458,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		F6B208541450F611009315AF /* Build configuration list for PBXNativeTarget "SRTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				F6B208551450F611009315AF /* Debug */,
-				F6B208561450F611009315AF /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		F6BDA813145900D200FE3253 /* Build configuration list for PBXNativeTarget "SRWebSocketTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

+ 1 - 1
SocketRocket.xcodeproj/xcshareddata/xcschemes/SocketRocket.xcscheme

@@ -31,7 +31,7 @@
             ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
             <ActionContent
                title = "Run Script"
-               scriptText = "PIDFILE=$TMPDIR/srtharness.pid&#10;if [ -r $PIDFILE ]; then&#10;EXISTING_PID=`cat $PIDFILE`&#10;    echo &quot;Killing Dangling SRTextharneess PID:&quot; $EXISTING_PID&#10;    kill $EXISTING_PID&#10;    rm $PIDFILE&#10;fi&#10;&#10;pushd $PROJECT_DIR&#10;&#10;export MACOSX_DEPLOYMENT_TARGET=&quot;10.7&quot;&#10;&#10;bash TestSupport/ensure_virtualenv.sh $PROJECT_DIR/.env&#10;source .env/bin/activate&#10;&#10;nohup sr-testharness -k hello_test_harness -i &apos;&apos; -c &apos;*&apos; &amp;&#10;echo $! &gt; $PIDFILE&#10;&#10;popd"
+               scriptText = "PIDFILE=$TMPDIR/srtharness.pid&#10;if [ -r $PIDFILE ]; then&#10;EXISTING_PID=`cat $PIDFILE`&#10;    echo &quot;Killing Dangling SRTextharneess PID:&quot; $EXISTING_PID&#10;    kill $EXISTING_PID&#10;    rm $PIDFILE&#10;fi&#10;&#10;pushd $PROJECT_DIR&#10;&#10;export MACOSX_DEPLOYMENT_TARGET=&quot;10.7&quot;&#10;&#10;bash TestSupport/ensure_virtualenv.sh $PROJECT_DIR/.env&#10;source .env/bin/activate&#10;&#10;&#10;nohup sr-testharness -k hello_test_harness -i &apos;&apos; -c &apos;[1-8]*&apos; &amp;&#10;&#10;#nohup sr-testharness -k hello_test_harness -i &apos;&apos; -c &apos;*&apos; &amp;&#10;&#10;echo $! &gt; $PIDFILE&#10;&#10;popd"
                shellToInvoke = "/bin/bash">
                <EnvironmentBuildable>
                   <BuildableReference