cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject ios commit: CB-6638 - Convert CordovaLibTests to XCTests
Date Tue, 06 May 2014 07:12:50 GMT
Repository: cordova-ios
Updated Branches:
  refs/heads/master 7937ac38d -> e996cf96b


CB-6638 - Convert CordovaLibTests to XCTests


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/e996cf96
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/e996cf96
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/e996cf96

Branch: refs/heads/master
Commit: e996cf96b9fb5cfe7b1a713f196dcbbdba14f00d
Parents: 7937ac3
Author: Shazron Abdullah <shazron@apache.org>
Authored: Tue May 6 00:12:43 2014 -0700
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Tue May 6 00:12:43 2014 -0700

----------------------------------------------------------------------
 CordovaLibTests/CDVBase64Tests.m                |   8 +-
 CordovaLibTests/CDVInvokedUrlCommandTests.m     |  20 ++--
 CordovaLibTests/CDVLocalStorageTests.m          |  20 ++--
 .../CDVPluginResultJSONSerializationTests.m     |  30 ++---
 CordovaLibTests/CDVStartPageTests.m             |   6 +-
 CordovaLibTests/CDVUserAgentTest.m              |   4 +-
 CordovaLibTests/CDVWebViewDelegateTests.m       |  20 ++--
 CordovaLibTests/CDVWebViewTest.h                |   4 +-
 CordovaLibTests/CDVWebViewTest.m                |   8 +-
 CordovaLibTests/CDVWhitelistTests.m             | 112 +++++++++----------
 .../CordovaTests.xcodeproj/project.pbxproj      |  44 ++++----
 11 files changed, 141 insertions(+), 135 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e996cf96/CordovaLibTests/CDVBase64Tests.m
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CDVBase64Tests.m b/CordovaLibTests/CDVBase64Tests.m
index 70fb38e..744601f 100644
--- a/CordovaLibTests/CDVBase64Tests.m
+++ b/CordovaLibTests/CDVBase64Tests.m
@@ -17,11 +17,11 @@
  under the License.
  */
 
-#import <SenTestingKit/SenTestingKit.h>
+#import <XCTest/XCTest.h>
 
 #import "NSData+Base64.h"
 
-@interface CDVBase64Tests : SenTestCase
+@interface CDVBase64Tests : XCTestCase
 @end
 
 @implementation CDVBase64Tests
@@ -48,7 +48,7 @@
     NSString* expectedEncodedString = @"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwIUAjJCVeJg==";
     NSString* actualEncodedString = [decodedData base64EncodedString];
 
-    STAssertTrue([expectedEncodedString isEqualToString:actualEncodedString], nil);
+    XCTAssertTrue([expectedEncodedString isEqualToString:actualEncodedString]);
 }
 
 - (void)testBase64Decode
@@ -58,7 +58,7 @@
     NSData* encodedData = [decodedString dataUsingEncoding:NSUTF8StringEncoding];
     NSData* decodedData = [NSData dataFromBase64String:encodedString];
 
-    STAssertTrue([encodedData isEqualToData:decodedData], nil);
+    XCTAssertTrue([encodedData isEqualToData:decodedData]);
 }
 
 @end

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e996cf96/CordovaLibTests/CDVInvokedUrlCommandTests.m
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CDVInvokedUrlCommandTests.m b/CordovaLibTests/CDVInvokedUrlCommandTests.m
index b939fc2..3f8dd18 100644
--- a/CordovaLibTests/CDVInvokedUrlCommandTests.m
+++ b/CordovaLibTests/CDVInvokedUrlCommandTests.m
@@ -17,11 +17,11 @@
  under the License.
  */
 
-#import <SenTestingKit/SenTestingKit.h>
+#import <XCTest/XCTest.h>
 
 #import "CDVInvokedUrlCommand.h"
 
-@interface CDVInvokedUrlCommandTests : SenTestCase
+@interface CDVInvokedUrlCommandTests : XCTestCase
 @end
 
 @implementation CDVInvokedUrlCommandTests
@@ -31,10 +31,10 @@
     NSArray* jsonArr = [NSArray arrayWithObjects:@"callbackId", @"className", @"methodName",
[NSArray array], nil];
     CDVInvokedUrlCommand* command = [CDVInvokedUrlCommand commandFromJson:jsonArr];
 
-    STAssertEquals(@"callbackId", command.callbackId, nil);
-    STAssertEquals(@"className", command.className, nil);
-    STAssertEquals(@"methodName", command.methodName, nil);
-    STAssertEquals([NSArray array], command.arguments, nil);
+    XCTAssertEqual(@"callbackId", command.callbackId);
+    XCTAssertEqual(@"className", command.className);
+    XCTAssertEqual(@"methodName", command.methodName);
+    XCTAssertEqual([NSArray array], command.arguments);
 }
 
 - (void)testArgumentAtIndex
@@ -42,10 +42,10 @@
     NSArray* jsonArr = [NSArray arrayWithObjects:[NSNull null], @"className", @"methodName",
[NSArray array], nil];
     CDVInvokedUrlCommand* command = [CDVInvokedUrlCommand commandFromJson:jsonArr];
 
-    STAssertNil([command argumentAtIndex:0], @"NSNull to nil");
-    STAssertNil([command argumentAtIndex:100], @"Invalid index to nil");
-    STAssertEquals(@"default", [command argumentAtIndex:0 withDefault:@"default"], @"NSNull
to default");
-    STAssertEquals(@"default", [command argumentAtIndex:100 withDefault:@"default"], @"Invalid
index to default");
+    XCTAssertNil([command argumentAtIndex:0], @"NSNull to nil");
+    XCTAssertNil([command argumentAtIndex:100], @"Invalid index to nil");
+    XCTAssertEqual(@"default", [command argumentAtIndex:0 withDefault:@"default"], @"NSNull
to default");
+    XCTAssertEqual(@"default", [command argumentAtIndex:100 withDefault:@"default"], @"Invalid
index to default");
 }
 
 @end

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e996cf96/CordovaLibTests/CDVLocalStorageTests.m
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CDVLocalStorageTests.m b/CordovaLibTests/CDVLocalStorageTests.m
index 675f5ea..f664508 100644
--- a/CordovaLibTests/CDVLocalStorageTests.m
+++ b/CordovaLibTests/CDVLocalStorageTests.m
@@ -17,7 +17,7 @@
  under the License.
  */
 
-#import <SenTestingKit/SenTestingKit.h>
+#import <XCTest/XCTest.h>
 
 #import "CDVLocalStorage.h"
 #import "CDVWebViewTest.h"
@@ -75,7 +75,7 @@
         return [localStorage shouldBackup];
     }];
     [localStorage backup:[CDVInvokedUrlCommand new]];
-    STAssertFalse([localStorage shouldBackup], @"Should have backed up.");
+    XCTAssertFalse([localStorage shouldBackup], @"Should have backed up.");
 
     // It would be nice to be able to test that the restore functionality
     // alters what localStorage.getItem('foo') returns, but it seems as though
@@ -84,16 +84,16 @@
 
     // Instead, we just test the file copying logic.
     [self deleteOriginals:YES backups:NO];
-    STAssertTrue([localStorage shouldRestore], @"Should restore after deleting originals");
+    XCTAssertTrue([localStorage shouldRestore], @"Should restore after deleting originals");
     [localStorage restore:[CDVInvokedUrlCommand new]];
-    STAssertFalse([localStorage shouldRestore], @"Restore did not complete successfully");
+    XCTAssertFalse([localStorage shouldRestore], @"Restore did not complete successfully");
 }
 
 - (void)testVerifyAndFixDatabaseLocations_noChangeRequired
 {
     NSString* const kBundlePath = @"/bpath";
     id fakeFileManager = [CDVFakeFileManager managerWithFileExistsBlock:^(NSString* path)
{
-            STFail(@"fileExists called.");
+            XCTFail(@"fileExists called.");
             return NO;
         }];
     NSMutableDictionary* appPlistDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
@@ -104,7 +104,7 @@
                                                                           bundlePath:kBundlePath
                                                                          fileManager:fakeFileManager];
 
-    STAssertFalse(modified, @"Should not have applied fix.");
+    XCTAssertFalse(modified, @"Should not have applied fix.");
 }
 
 - (void)testVerifyAndFixDatabaseLocations_changeRequired1
@@ -120,9 +120,9 @@
                                                                           bundlePath:kBundlePath
                                                                          fileManager:fakeFileManager];
 
-    STAssertTrue(modified, @"Should have applied fix.");
+    XCTAssertTrue(modified, @"Should have applied fix.");
     NSString* newPath = [appPlistDict objectForKey:@"WebKitLocalStorageDatabasePathPreferenceKey"];
-    STAssertTrue([@"/bpath/Library/Caches" isEqualToString: newPath], nil);
+    XCTAssertTrue([@"/bpath/Library/Caches" isEqualToString: newPath]);
 }
 
 - (void)testVerifyAndFixDatabaseLocations_changeRequired2
@@ -138,9 +138,9 @@
                                                                           bundlePath:kBundlePath
                                                                          fileManager:fakeFileManager];
 
-    STAssertTrue(modified, @"Should have applied fix.");
+    XCTAssertTrue(modified, @"Should have applied fix.");
     NSString* newPath = [appPlistDict objectForKey:@"WebDatabaseDirectory"];
-    STAssertTrue([@"/bpath/Library/WebKit" isEqualToString: newPath], nil);
+    XCTAssertTrue([@"/bpath/Library/WebKit" isEqualToString: newPath]);
 }
 
 @end

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e996cf96/CordovaLibTests/CDVPluginResultJSONSerializationTests.m
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CDVPluginResultJSONSerializationTests.m b/CordovaLibTests/CDVPluginResultJSONSerializationTests.m
index 57b9022..203e9a1 100644
--- a/CordovaLibTests/CDVPluginResultJSONSerializationTests.m
+++ b/CordovaLibTests/CDVPluginResultJSONSerializationTests.m
@@ -18,12 +18,12 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <SenTestingKit/SenTestingKit.h>
+#import <XCTest/XCTest.h>
 
 #import "CDVPluginResult.h"
 #import "CDVJSON.h"
 
-@interface CDVPluginResultJSONSerializationTests : SenTestCase
+@interface CDVPluginResultJSONSerializationTests : XCTestCase
 @end
 
 @implementation CDVPluginResultJSONSerializationTests
@@ -34,7 +34,7 @@
     NSDictionary* dic = [[result toJSONString] JSONObject];
     NSNumber* message = [dic objectForKey:@"message"];
 
-    STAssertTrue([[NSNumber numberWithInt:5] isEqual:message], nil);
+    XCTAssertTrue([[NSNumber numberWithInt:5] isEqual:message]);
 }
 
 - (void)testSerializingMessageAsDouble
@@ -43,7 +43,7 @@
     NSDictionary* dic = [[result toJSONString] JSONObject];
     NSNumber* message = [dic objectForKey:@"message"];
 
-    STAssertTrue([[NSNumber numberWithDouble:5.5] isEqual:message], nil);
+    XCTAssertTrue([[NSNumber numberWithDouble:5.5] isEqual:message]);
 }
 
 - (void)testSerializingMessageAsBool
@@ -52,7 +52,7 @@
     NSDictionary* dic = [[result toJSONString] JSONObject];
     NSNumber* message = [dic objectForKey:@"message"];
 
-    STAssertTrue([[NSNumber numberWithBool:YES] isEqual:message], nil);
+    XCTAssertTrue([[NSNumber numberWithBool:YES] isEqual:message]);
 }
 
 - (void)testSerializingMessageAsArray
@@ -69,31 +69,31 @@
     NSDictionary* dic = [[result toJSONString] JSONObject];
     NSArray* message = [dic objectForKey:@"message"];
 
-    STAssertTrue([message isKindOfClass:[NSArray class]], nil);
-    STAssertTrue([testValues count] == [message count], nil);
+    XCTAssertTrue([message isKindOfClass:[NSArray class]]);
+    XCTAssertTrue([testValues count] == [message count]);
 
     for (NSInteger i = 0; i < [testValues count]; i++) {
-        STAssertTrue([[testValues objectAtIndex:i] isEqual:[message objectAtIndex:i]], nil);
+        XCTAssertTrue([[testValues objectAtIndex:i] isEqual:[message objectAtIndex:i]]);
     }
 }
 
 - (void)__testDictionary:(NSDictionary*)dictA withDictionary:(NSDictionary*)dictB
 {
-    STAssertTrue([dictA isKindOfClass:[NSDictionary class]], nil);
-    STAssertTrue([dictB isKindOfClass:[NSDictionary class]], nil);
+    XCTAssertTrue([dictA isKindOfClass:[NSDictionary class]]);
+    XCTAssertTrue([dictB isKindOfClass:[NSDictionary class]]);
 
-    STAssertTrue([[dictA allKeys] count] == [[dictB allKeys] count], nil);
+    XCTAssertTrue([[dictA allKeys] count] == [[dictB allKeys] count]);
 
     for (NSInteger i = 0; i < [dictA count]; i++) {
         id keyA = [[dictA allKeys] objectAtIndex:i];
         id objA = [dictA objectForKey:keyA];
         id objB = [dictB objectForKey:keyA];
 
-        STAssertTrue([[dictB allKeys] containsObject:keyA], nil); // key exists
+        XCTAssertTrue([[dictB allKeys] containsObject:keyA]); // key exists
         if ([objA isKindOfClass:[NSDictionary class]]) {
             [self __testDictionary:objA withDictionary:objB];
         } else {
-            STAssertTrue([objA isEqual:objB], nil); // key's value equality
+            XCTAssertTrue([objA isEqual:objB]); // key's value equality
         }
     }
 }
@@ -139,7 +139,7 @@
     NSDictionary* dic = [[result toJSONString] JSONObject];
     NSString* message = [dic objectForKey:@"message"];
 
-    STAssertTrue([quotedString isEqual:message], nil);
+    XCTAssertTrue([quotedString isEqual:message]);
 }
 
 - (void)testSerializingMessageAsStringThatIsNil
@@ -149,7 +149,7 @@
     NSDictionary* dic = [[result toJSONString] JSONObject];
     NSString* message = [dic objectForKey:@"message"];
 
-    STAssertTrue([[NSNull null] isEqual:message], nil);
+    XCTAssertTrue([[NSNull null] isEqual:message]);
 }
 
 @end

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e996cf96/CordovaLibTests/CDVStartPageTests.m
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CDVStartPageTests.m b/CordovaLibTests/CDVStartPageTests.m
index a57798c..452e4f8 100644
--- a/CordovaLibTests/CDVStartPageTests.m
+++ b/CordovaLibTests/CDVStartPageTests.m
@@ -17,7 +17,7 @@
  under the License.
  */
 
-#import <SenTestingKit/SenTestingKit.h>
+#import <XCTest/XCTest.h>
 
 #import "CDVWebViewTest.h"
 #import "CDVViewController.h"
@@ -86,10 +86,10 @@
     }];
 
     NSString* href = [rootVc.vc1.webView stringByEvaluatingJavaScriptFromString:geHREF];
-    STAssertTrue([href hasSuffix:@"index.html"], @"href should point to index.html");
+    XCTAssertTrue([href hasSuffix:@"index.html"], @"href should point to index.html");
 
     href = [rootVc.vc2.webView stringByEvaluatingJavaScriptFromString:geHREF];
-    STAssertTrue([href hasSuffix:@"index.html?delta=true"], @"href should point to index.html?delta=true");
+    XCTAssertTrue([href hasSuffix:@"index.html?delta=true"], @"href should point to index.html?delta=true");
 }
 
 @end

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e996cf96/CordovaLibTests/CDVUserAgentTest.m
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CDVUserAgentTest.m b/CordovaLibTests/CDVUserAgentTest.m
index 98659f8..1a68364 100644
--- a/CordovaLibTests/CDVUserAgentTest.m
+++ b/CordovaLibTests/CDVUserAgentTest.m
@@ -17,7 +17,7 @@
  under the License.
  */
 
-#import <SenTestingKit/SenTestingKit.h>
+#import <XCTest/XCTest.h>
 
 #import "CDVWebViewTest.h"
 #import "CDVViewController.h"
@@ -87,7 +87,7 @@
     NSString* ua1 = [rootVc.vc1.webView stringByEvaluatingJavaScriptFromString:getUserAgentCode];
     NSString* ua2 = [rootVc.vc2.webView stringByEvaluatingJavaScriptFromString:getUserAgentCode];
 
-    STAssertFalse([ua1 isEqual:ua2], @"User-Agents should be different.");
+    XCTAssertFalse([ua1 isEqual:ua2], @"User-Agents should be different.");
 }
 
 @end

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e996cf96/CordovaLibTests/CDVWebViewDelegateTests.m
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CDVWebViewDelegateTests.m b/CordovaLibTests/CDVWebViewDelegateTests.m
index db18401..15af654 100644
--- a/CordovaLibTests/CDVWebViewDelegateTests.m
+++ b/CordovaLibTests/CDVWebViewDelegateTests.m
@@ -17,11 +17,11 @@
  under the License.
  */
 
-#import <SenTestingKit/SenTestingKit.h>
+#import <XCTest/XCTest.h>
 
 #import <Cordova/CDVWebViewDelegate.h>
 
-@interface CDVWebViewDelegateTests : SenTestCase
+@interface CDVWebViewDelegateTests : XCTestCase
 @end
 
 @implementation CDVWebViewDelegateTests
@@ -67,16 +67,16 @@
     NSURLRequest* originalRequestWithQueryParamsAndFragment = [NSURLRequest requestWithURL:originalUrlWithQueryParamsAndFragment];
     NSURLRequest* notOriginalRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://httpd.apache.org"]];
 
-    STAssertTrue([wvd request:originalRequest isEqualToRequestAfterStrippingFragments:originalRequest],
@"originalRequest should be a be equal to originalRequest after stripping fragments");
-    STAssertTrue([wvd request:originalRequestWithFragmentOnly isEqualToRequestAfterStrippingFragments:originalRequest],
@"originalRequestWithFragment should be equal to originalRequest after stripping fragment");
-    STAssertTrue([wvd request:originalRequestWithFragmentOnlyNoIdentifier isEqualToRequestAfterStrippingFragments:originalRequest],
@"originalRequestWithFragmentNoIdentifier should be equal to originalRequest after stripping
fragment");
-    STAssertFalse([wvd request:originalRequestWithQueryParamsAndFragment isEqualToRequestAfterStrippingFragments:originalRequest],
@"originalRequestWithQueryParamsAndFragment should not be equal to originalRequest after stripping
fragment");
-    STAssertFalse([wvd request:notOriginalRequest isEqualToRequestAfterStrippingFragments:originalRequest],
@"notOriginalRequest should not be equal to originalRequest after stripping fragment");
+    XCTAssertTrue([wvd request:originalRequest isEqualToRequestAfterStrippingFragments:originalRequest],
@"originalRequest should be a be equal to originalRequest after stripping fragments");
+    XCTAssertTrue([wvd request:originalRequestWithFragmentOnly isEqualToRequestAfterStrippingFragments:originalRequest],
@"originalRequestWithFragment should be equal to originalRequest after stripping fragment");
+    XCTAssertTrue([wvd request:originalRequestWithFragmentOnlyNoIdentifier isEqualToRequestAfterStrippingFragments:originalRequest],
@"originalRequestWithFragmentNoIdentifier should be equal to originalRequest after stripping
fragment");
+    XCTAssertFalse([wvd request:originalRequestWithQueryParamsAndFragment isEqualToRequestAfterStrippingFragments:originalRequest],
@"originalRequestWithQueryParamsAndFragment should not be equal to originalRequest after stripping
fragment");
+    XCTAssertFalse([wvd request:notOriginalRequest isEqualToRequestAfterStrippingFragments:originalRequest],
@"notOriginalRequest should not be equal to originalRequest after stripping fragment");
 
     // equality tests
-    STAssertTrue([wvd request:originalRequestWithFragmentOnly isEqualToRequestAfterStrippingFragments:originalRequestWithFragmentOnly],
@"originalRequestWithFragment should be a equal to itself after stripping fragments");
-    STAssertTrue([wvd request:originalRequestWithFragmentOnlyNoIdentifier isEqualToRequestAfterStrippingFragments:originalRequestWithFragmentOnlyNoIdentifier],
@"originalRequestWithFragmentNoIdentifier should be a equal to itself after stripping fragments");
-    STAssertTrue([wvd request:originalRequestWithQueryParamsAndFragment isEqualToRequestAfterStrippingFragments:originalRequestWithQueryParamsAndFragment],
@"originalRequestWithQueryParamsAndFragment should be equal to itself after stripping fragments");
+    XCTAssertTrue([wvd request:originalRequestWithFragmentOnly isEqualToRequestAfterStrippingFragments:originalRequestWithFragmentOnly],
@"originalRequestWithFragment should be a equal to itself after stripping fragments");
+    XCTAssertTrue([wvd request:originalRequestWithFragmentOnlyNoIdentifier isEqualToRequestAfterStrippingFragments:originalRequestWithFragmentOnlyNoIdentifier],
@"originalRequestWithFragmentNoIdentifier should be a equal to itself after stripping fragments");
+    XCTAssertTrue([wvd request:originalRequestWithQueryParamsAndFragment isEqualToRequestAfterStrippingFragments:originalRequestWithQueryParamsAndFragment],
@"originalRequestWithQueryParamsAndFragment should be equal to itself after stripping fragments");
 }
 
 @end

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e996cf96/CordovaLibTests/CDVWebViewTest.h
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CDVWebViewTest.h b/CordovaLibTests/CDVWebViewTest.h
index 21d7203..e11b825 100644
--- a/CordovaLibTests/CDVWebViewTest.h
+++ b/CordovaLibTests/CDVWebViewTest.h
@@ -17,13 +17,13 @@
  under the License.
  */
 
-#import <SenTestingKit/SenTestingKit.h>
+#import <XCTest/XCTest.h>
 #import <UIKit/UIKit.h>
 
 @class AppDelegate;
 @class CDVViewController;
 
-@interface CDVWebViewTest : SenTestCase
+@interface CDVWebViewTest : XCTestCase
 
 @property (nonatomic, strong) UIWebView* webView;
 

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e996cf96/CordovaLibTests/CDVWebViewTest.m
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CDVWebViewTest.m b/CordovaLibTests/CDVWebViewTest.m
index e22992a..c395f48 100644
--- a/CordovaLibTests/CDVWebViewTest.m
+++ b/CordovaLibTests/CDVWebViewTest.m
@@ -38,7 +38,7 @@
     // first exception makes it much easier to identify the source of the error.
     // On iOS < 5 there is a bug in SenTestingKit where the exception is
     // uncaught and the app crashes upon a failed STAssert (oh well).
-    [self raiseAfterFailure];
+    //[self raiseAfterFailure];
 }
 
 - (void)tearDown
@@ -65,7 +65,7 @@
         // here.
         [self waitForPageLoad];
     }
-    STAssertNotNil(self.appDelegate.viewController, @"createViewController failed");
+    XCTAssertNotNil(self.appDelegate.viewController, @"createViewController failed");
     return self.appDelegate.viewController;
 }
 
@@ -78,7 +78,7 @@
 {
     id ret = [self.viewController getCommandInstance:pluginName];
 
-    STAssertNotNil(ret, @"Missing plugin %@", pluginName);
+    XCTAssertNotNil(ret, @"Missing plugin %@", pluginName);
     return ret;
 }
 
@@ -101,7 +101,7 @@
     while (!block()) {
         [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
         NSTimeInterval elapsed = -[startTime timeIntervalSinceNow];
-        STAssertTrue(i < kMinIterations || elapsed < kConditionTimeout,
+        XCTAssertTrue(i < kMinIterations || elapsed < kConditionTimeout,
             @"Timed out waiting for condition %@", conditionName);
         ++i;
     }

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e996cf96/CordovaLibTests/CDVWhitelistTests.m
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CDVWhitelistTests.m b/CordovaLibTests/CDVWhitelistTests.m
index 77b3b75..abb984c 100644
--- a/CordovaLibTests/CDVWhitelistTests.m
+++ b/CordovaLibTests/CDVWhitelistTests.m
@@ -17,11 +17,11 @@
  under the License.
  */
 
-#import <SenTestingKit/SenTestingKit.h>
+#import <XCTest/XCTest.h>
 
 #import "CDVWhitelist.h"
 
-@interface CDVWhitelistTests : SenTestCase
+@interface CDVWhitelistTests : XCTestCase
 @end
 
 @implementation CDVWhitelistTests
@@ -48,11 +48,11 @@
 
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertTrue([whitelist schemeIsAllowed:@"http"], nil);
-    STAssertTrue([whitelist schemeIsAllowed:@"https"], nil);
-    STAssertTrue([whitelist schemeIsAllowed:@"ftp"], nil);
-    STAssertTrue([whitelist schemeIsAllowed:@"ftps"], nil);
-    STAssertFalse([whitelist schemeIsAllowed:@"gopher"], nil);
+    XCTAssertTrue([whitelist schemeIsAllowed:@"http"]);
+    XCTAssertTrue([whitelist schemeIsAllowed:@"https"]);
+    XCTAssertTrue([whitelist schemeIsAllowed:@"ftp"]);
+    XCTAssertTrue([whitelist schemeIsAllowed:@"ftps"]);
+    XCTAssertFalse([whitelist schemeIsAllowed:@"gopher"]);
 }
 
 - (void)testSubdomainWildcard
@@ -63,10 +63,10 @@
 
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://build.apache.org"]],
nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://sub1.sub0.build.apache.org"]],
nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org.ca"]],
nil);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://build.apache.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://sub1.sub0.build.apache.org"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org.ca"]]);
 }
 
 - (void)testCatchallWildcardOnly
@@ -77,11 +77,11 @@
 
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://build.apache.prg"]],
nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"ftp://MyDangerousSite.org"]],
nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"ftps://apache.org.SuspiciousSite.com"]],
nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"gopher://apache.org"]], nil);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://build.apache.prg"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"ftp://MyDangerousSite.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"ftps://apache.org.SuspiciousSite.com"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"gopher://apache.org"]]);
 }
 
 - (void)testCatchallWildcardByProto
@@ -95,11 +95,11 @@
 
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://build.apache.prg"]],
nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"ftp://MyDangerousSite.org"]],
nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"ftps://apache.org.SuspiciousSite.com"]],
nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"gopher://apache.org"]],
nil);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://build.apache.prg"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"ftp://MyDangerousSite.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"ftps://apache.org.SuspiciousSite.com"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"gopher://apache.org"]]);
 }
 
 - (void)testExactMatch
@@ -110,9 +110,9 @@
 
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.apache.org"]],
nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://build.apache.org"]],
nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]], nil);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.apache.org"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://build.apache.org"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]]);
 }
 
 - (void)testNoMatchInQueryParam
@@ -123,8 +123,8 @@
 
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"www.malicious-site.org?url=http://www.apache.org"]],
nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"www.malicious-site.org?url=www.apache.org"]],
nil);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"www.malicious-site.org?url=http://www.apache.org"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"www.malicious-site.org?url=www.apache.org"]]);
 }
 
 - (void)testIpExactMatch
@@ -136,10 +136,10 @@
 
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.1.1"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.2.1"]], nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.3.1"]], nil);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.1.1"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.2.1"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.3.1"]]);
 }
 
 - (void)testIpWildcardMatch
@@ -151,15 +151,15 @@
     
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]], nil);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]]);
     
     // Ever since Cordova 3.1, whitelist wildcards are simplified, only "*" and "*.apache.org"
(subdomain example) are allowed. Therefore the next four tests should fail
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.1.1"]], nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.1.2"]], nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.2.1"]], nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.2.2"]], nil);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.1.1"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.1.2"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.2.1"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.2.2"]]);
     
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.3.1"]], nil);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.3.1"]]);
 }
 
 - (void)testHostnameExtraction
@@ -174,8 +174,8 @@
 
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org/"]], nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://google.com/"]], nil);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org/"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://google.com/"]]);
 }
 
 - (void)testWhitelistRejectionString
@@ -187,12 +187,12 @@
     NSString* errorString = [whitelist errorStringForURL:testUrl];
     NSString* expectedErrorString = [NSString stringWithFormat:kCDVDefaultWhitelistRejectionString,
[testUrl absoluteString]];
 
-    STAssertTrue([expectedErrorString isEqualToString:errorString], @"Default error string
has an unexpected value.");
+    XCTAssertTrue([expectedErrorString isEqualToString:errorString], @"Default error string
has an unexpected value.");
 
     whitelist.whitelistRejectionFormatString = @"Hey, '%@' is, like, bogus man!";
     errorString = [whitelist errorStringForURL:testUrl];
     expectedErrorString = [NSString stringWithFormat:whitelist.whitelistRejectionFormatString,
[testUrl absoluteString]];
-    STAssertTrue([expectedErrorString isEqualToString:errorString], @"Customized whitelist
rejection string has unexpected value.");
+    XCTAssertTrue([expectedErrorString isEqualToString:errorString], @"Customized whitelist
rejection string has unexpected value.");
 }
 
 - (void)testSpecificProtocol
@@ -204,10 +204,10 @@
 
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.apache.org"]],
nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"cordova://www.google.com"]],
nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"cordova://www.apache.org"]],
nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.google.com"]],
nil);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.apache.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"cordova://www.google.com"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"cordova://www.apache.org"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.google.com"]]);
 }
 
 - (void)testWildcardPlusOtherUrls
@@ -221,11 +221,11 @@
 
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://*.apache.org"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://www.google.com"]],
nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"ftp://cordova.apache.org"]],
nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://cordova.apache.org"]],
nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://cordova.apache.org"]],
nil);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://*.apache.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://www.google.com"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"ftp://cordova.apache.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://cordova.apache.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"https://cordova.apache.org"]]);
 }
 
 - (void)testWildcardPlusScheme
@@ -236,11 +236,11 @@
 
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.apache.org"]],
nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"https://www.google.com"]],
nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"ftp://cordova.apache.org"]],
nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://cordova.apache.org"]],
nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"https://cordova.apache.org"]],
nil);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.apache.org"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"https://www.google.com"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"ftp://cordova.apache.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://cordova.apache.org"]]);
+    XCTAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"https://cordova.apache.org"]]);
 }
 
 - (void)testCredentials
@@ -252,8 +252,8 @@
 
     CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
 
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://user:pass@www.apache.org"]],
nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://user:pass@www.google.com"]],
nil);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://user:pass@www.apache.org"]]);
+    XCTAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://user:pass@www.google.com"]]);
 }
 
 @end

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/e996cf96/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj b/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj
index 056cb19..2857be4 100644
--- a/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj
+++ b/CordovaLibTests/CordovaTests.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3019D58D1918C00C00D72DCC /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef
= 3019D58B1918BFF800D72DCC /* XCTest.framework */; };
 		302193F91745430F00BC8D2B /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef
= 302193F81745430F00BC8D2B /* ImageIO.framework */; };
 		3035621714104C34006C2D43 /* CDVWhitelistTests.m in Sources */ = {isa = PBXBuildFile; fileRef
= 30356213141049E1006C2D43 /* CDVWhitelistTests.m */; };
 		303A406A152124BB00182201 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef
= 686357AA141002F100DF4CF2 /* UIKit.framework */; };
@@ -85,6 +86,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		3019D58B1918BFF800D72DCC /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework;
sourceTree = DEVELOPER_DIR; };
 		302193F81745430F00BC8D2B /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework;
sourceTree = SDKROOT; };
 		30356213141049E1006C2D43 /* CDVWhitelistTests.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path = CDVWhitelistTests.m; sourceTree = "<group>";
};
 		303A4068152124BB00182201 /* CordovaLibApp.app */ = {isa = PBXFileReference; explicitFileType
= wrapper.application; includeInIndex = 0; path = CordovaLibApp.app; sourceTree = BUILT_PRODUCTS_DIR;
};
@@ -99,7 +101,7 @@
 		30B342F415224B360070E6A5 /* CDVWebViewTest.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path = CDVWebViewTest.m; sourceTree = "<group>";
};
 		30D1B08B15A2B36D0060C291 /* CDVBase64Tests.m */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = sourcecode.c.objc; path = CDVBase64Tests.m; sourceTree = "<group>";
};
 		30F8AE1C152129DA006625B3 /* www */ = {isa = PBXFileReference; lastKnownFileType = folder;
path = www; sourceTree = "<group>"; };
-		686357A9141002F100DF4CF2 /* CordovaLibTests.octest */ = {isa = PBXFileReference; explicitFileType
= wrapper.cfbundle; includeInIndex = 0; path = CordovaLibTests.octest; sourceTree = BUILT_PRODUCTS_DIR;
};
+		686357A9141002F100DF4CF2 /* CordovaLibTests.xctest */ = {isa = PBXFileReference; explicitFileType
= wrapper.cfbundle; includeInIndex = 0; path = CordovaLibTests.xctest; sourceTree = BUILT_PRODUCTS_DIR;
};
 		686357AA141002F100DF4CF2 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework;
sourceTree = SDKROOT; };
 		686357AC141002F100DF4CF2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework;
sourceTree = SDKROOT; };
 		686357AE141002F100DF4CF2 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType
= wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework;
sourceTree = SDKROOT; };
@@ -153,6 +155,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3019D58D1918C00C00D72DCC /* XCTest.framework in Frameworks */,
 				68A32D7514103017006B237C /* AddressBook.framework in Frameworks */,
 				8220B5C616D542F500EC3921 /* AssetsLibrary.framework in Frameworks */,
 				68A32D7614103078006B237C /* CoreMedia.framework in Frameworks */,
@@ -174,7 +177,7 @@
 		034768DFFF38A50411DB9C8B /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				686357A9141002F100DF4CF2 /* CordovaLibTests.octest */,
+				686357A9141002F100DF4CF2 /* CordovaLibTests.xctest */,
 				303A4068152124BB00182201 /* CordovaLibApp.app */,
 			);
 			name = Products;
@@ -197,6 +200,7 @@
 		0867D69AFE84028FC02AAC07 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				3019D58B1918BFF800D72DCC /* XCTest.framework */,
 				302193F81745430F00BC8D2B /* ImageIO.framework */,
 				68A32D7414103017006B237C /* AddressBook.framework */,
 				8220B5C116D541BD00EC3921 /* AssetsLibrary.framework */,
@@ -313,8 +317,8 @@
 			);
 			name = CordovaLibTests;
 			productName = CordovaLibTests;
-			productReference = 686357A9141002F100DF4CF2 /* CordovaLibTests.octest */;
-			productType = "com.apple.product-type.bundle";
+			productReference = 686357A9141002F100DF4CF2 /* CordovaLibTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
 		};
 /* End PBXNativeTarget section */
 
@@ -571,6 +575,10 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -580,7 +588,7 @@
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				INFOPLIST_FILE = "CordovaLibApp/CordovaLibApp-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "Classes/** ../CordovaLib/Classes/**";
 				WRAPPER_EXTENSION = app;
@@ -594,11 +602,15 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				INFOPLIST_FILE = "CordovaLibApp/CordovaLibApp-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				USER_HEADER_SEARCH_PATHS = "Classes/** ../CordovaLib/Classes/**";
@@ -615,7 +627,8 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(DEVELOPER_LIBRARY_DIR)/Frameworks",
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
@@ -623,19 +636,15 @@
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = "CordovaLibTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-all_load",
 					"-ObjC",
-					"-framework",
-					SenTestingKit,
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_AFTER_BUILD = NO;
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				USER_HEADER_SEARCH_PATHS = "Classes/** ../CordovaLib/Classes/**";
-				WRAPPER_EXTENSION = octest;
 			};
 			name = Debug;
 		};
@@ -647,25 +656,22 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(DEVELOPER_LIBRARY_DIR)/Frameworks",
+					"$(inherited)",
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
 				);
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = "CordovaLibTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
-				ONLY_ACTIVE_ARCH = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"-all_load",
 					"-ObjC",
-					"-framework",
-					SenTestingKit,
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TEST_AFTER_BUILD = NO;
 				TEST_HOST = "$(BUNDLE_LOADER)";
 				USER_HEADER_SEARCH_PATHS = "Classes/** ../CordovaLib/Classes/**";
-				WRAPPER_EXTENSION = octest;
 			};
 			name = Release;
 		};


Mime
View raw message