incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [4/8] ios commit: Move test lib and test app out of CordovaLib.
Date Tue, 02 Oct 2012 18:16:22 GMT
Move test lib and test app out of CordovaLib.

Also removes unused: CordovaLib/Makefile and CordovaLib/javascript


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

Branch: refs/heads/master
Commit: 4d003a7205ecdb7a1e9cb6aec15624e05cd1d0c4
Parents: 4aea2d5
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Tue Oct 2 13:21:52 2012 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Tue Oct 2 13:21:52 2012 -0400

----------------------------------------------------------------------
 CordovaLib/CordovaLib.xcodeproj/project.pbxproj    |   19 -
 CordovaLib/CordovaLibApp/AppDelegate.h             |   33 -
 CordovaLib/CordovaLibApp/AppDelegate.m             |  108 -
 CordovaLib/CordovaLibApp/Cordova.plist             |   69 -
 CordovaLib/CordovaLibApp/CordovaLibApp-Info.plist  |   45 -
 CordovaLib/CordovaLibApp/CordovaLibApp-Prefix.pch  |   35 -
 CordovaLib/CordovaLibApp/ViewController.h          |   25 -
 CordovaLib/CordovaLibApp/ViewController.m          |   54 -
 .../CordovaLibApp/en.lproj/InfoPlist.strings       |   20 -
 CordovaLib/CordovaLibApp/main.m                    |   29 -
 CordovaLib/CordovaLibApp/www/index.html            |   84 -
 CordovaLib/CordovaLibTests/CDVBase64Tests.m        |   64 -
 CordovaLib/CordovaLibTests/CDVContactsTests.m      |   60 -
 CordovaLib/CordovaLibTests/CDVFakeFileManager.h    |   35 -
 CordovaLib/CordovaLibTests/CDVFakeFileManager.m    |   49 -
 CordovaLib/CordovaLibTests/CDVFileTransferTests.m  |  217 -
 .../CordovaLibTests/CDVInvokedUrlCommandTests.m    |   96 -
 CordovaLib/CordovaLibTests/CDVLocalStorageTests.m  |  146 -
 .../CDVPluginResultJSONSerializationTests.m        |  146 -
 CordovaLib/CordovaLibTests/CDVWebViewTest.h        |   42 -
 CordovaLib/CordovaLibTests/CDVWebViewTest.m        |  123 -
 CordovaLib/CordovaLibTests/CDVWhitelistTests.m     |  248 -
 .../CordovaLibTests/CordovaLibTests-Info.plist     |   42 -
 .../CordovaLibTests/CordovaLibTests-Prefix.pch     |   25 -
 .../CordovaLibTests/en.lproj/InfoPlist.strings     |   20 -
 CordovaLib/CordovaTests.xcodeproj/project.pbxproj  |  684 --
 .../xcshareddata/xcschemes/CordovaLibApp.xcscheme  |   95 -
 .../xcschemes/CordovaLibTests.xcscheme             |   52 -
 CordovaLib/Makefile                                |   47 -
 CordovaLib/javascript/cordova.ios.js               | 6072 ---------------
 CordovaLibTests/CDVBase64Tests.m                   |   64 +
 CordovaLibTests/CDVContactsTests.m                 |   60 +
 CordovaLibTests/CDVFakeFileManager.h               |   35 +
 CordovaLibTests/CDVFakeFileManager.m               |   49 +
 CordovaLibTests/CDVFileTransferTests.m             |  217 +
 CordovaLibTests/CDVInvokedUrlCommandTests.m        |   96 +
 CordovaLibTests/CDVLocalStorageTests.m             |  146 +
 .../CDVPluginResultJSONSerializationTests.m        |  146 +
 CordovaLibTests/CDVWebViewTest.h                   |   43 +
 CordovaLibTests/CDVWebViewTest.m                   |  123 +
 CordovaLibTests/CDVWhitelistTests.m                |  248 +
 CordovaLibTests/CordovaLibApp/AppDelegate.h        |   33 +
 CordovaLibTests/CordovaLibApp/AppDelegate.m        |  105 +
 CordovaLibTests/CordovaLibApp/Cordova.plist        |   69 +
 .../CordovaLibApp/CordovaLibApp-Info.plist         |   45 +
 CordovaLibTests/CordovaLibApp/ViewController.h     |   25 +
 CordovaLibTests/CordovaLibApp/ViewController.m     |   54 +
 .../CordovaLibApp/en.lproj/InfoPlist.strings       |   20 +
 CordovaLibTests/CordovaLibApp/main.m               |   29 +
 CordovaLibTests/CordovaLibApp/www/index.html       |   84 +
 CordovaLibTests/CordovaLibTests-Info.plist         |   42 +
 .../CordovaTests.xcodeproj/project.pbxproj         |  676 ++
 .../xcshareddata/xcschemes/CordovaLibApp.xcscheme  |   95 +
 .../xcschemes/CordovaLibTests.xcscheme             |   62 +
 CordovaLibTests/en.lproj/InfoPlist.strings         |   20 +
 Makefile                                           |    4 +-
 56 files changed, 2587 insertions(+), 8787 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index fad66de..d89f64d 100644
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@ -380,7 +380,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 1DEB921E08733DC00010E9CD /* Build configuration list for PBXNativeTarget "CordovaLib" */;
 			buildPhases = (
-				3044C11210BC6AEE00581BFB /* Make cordova.js */,
 				D2AAC07A0554694100DB518D /* Headers */,
 				D2AAC07B0554694100DB518D /* Sources */,
 				D2AAC07C0554694100DB518D /* Frameworks */,
@@ -423,24 +422,6 @@
 		};
 /* End PBXProject section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		3044C11210BC6AEE00581BFB /* Make cordova.js */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Make cordova.js";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "make
-";
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		D2AAC07B0554694100DB518D /* Sources */ = {
 			isa = PBXSourcesBuildPhase;

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibApp/AppDelegate.h
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/AppDelegate.h b/CordovaLib/CordovaLibApp/AppDelegate.h
deleted file mode 100644
index d26fb8e..0000000
--- a/CordovaLib/CordovaLibApp/AppDelegate.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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>
-
-@class ViewController;
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow* window;
-
-@property (strong, nonatomic) ViewController* viewController;
-
-- (void)createViewController;
-- (void)destroyViewController;
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibApp/AppDelegate.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/AppDelegate.m b/CordovaLib/CordovaLibApp/AppDelegate.m
deleted file mode 100644
index 77f681f..0000000
--- a/CordovaLib/CordovaLibApp/AppDelegate.m
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 "AppDelegate.h"
-
-#import <Cordova/CDVURLProtocol.h>
-#import "ViewController.h"
-
-@implementation AppDelegate
-
-@synthesize window = _window;
-@synthesize viewController = _viewController;
-
-- (id)init
-{
-    NSHTTPCookieStorage* cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
-
-    [cookieStorage setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
-
-    [CDVURLProtocol registerURLProtocol];
-
-    self = [super init];
-    return self;
-}
-
-- (void)createViewController
-{
-    NSAssert(!self.viewController, @"ViewController already created.");
-
-    self.viewController = [[ViewController alloc] init];
-    self.viewController.useSplashScreen = YES;
-    self.viewController.wwwFolderName = @"www";
-    self.viewController.startPage = @"index.html";
-
-    // NOTE: To control the view's frame size, override [self.viewController viewWillAppear:] in your view controller.
-
-    self.window.rootViewController = self.viewController;
-}
-
-- (void)destroyViewController
-{
-    // Clean up circular refs so that the view controller will actually be released.
-    [self.viewController dispose];
-    self.viewController = nil;
-    self.window.rootViewController = nil;
-}
-
-- (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
-{
-    CGRect screenBounds = [[UIScreen mainScreen] bounds];
-
-    self.window = [[UIWindow alloc] initWithFrame:screenBounds];
-    self.window.autoresizesSubviews = YES;
-
-    // Create the main view on start-up only when not running unit tests.
-    if (!NSClassFromString(@"CDVWebViewTest")) {
-        [self createViewController];
-    }
-
-    [self.window makeKeyAndVisible];
-
-    return YES;
-}
-
-- (void)applicationWillResignActive:(UIApplication*)application
-{
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-}
-
-- (void)applicationDidEnterBackground:(UIApplication*)application
-{
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-}
-
-- (void)applicationWillEnterForeground:(UIApplication*)application
-{
-    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-}
-
-- (void)applicationDidBecomeActive:(UIApplication*)application
-{
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-}
-
-- (void)applicationWillTerminate:(UIApplication*)application
-{
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibApp/Cordova.plist
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/Cordova.plist b/CordovaLib/CordovaLibApp/Cordova.plist
deleted file mode 100644
index 2bbdcf9..0000000
--- a/CordovaLib/CordovaLibApp/Cordova.plist
+++ /dev/null
@@ -1,69 +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>KeyboardDisplayRequiresUserAction</key>
-    <true/>
-    <key>SuppressesIncrementalRendering</key>
-    <false/>
-	<key>UIWebViewBounce</key>
-	<true/>
-	<key>TopActivityIndicator</key>
-	<string>gray</string>
-	<key>EnableLocation</key>
-	<false/>
-	<key>EnableViewportScale</key>
-	<false/>
-	<key>AutoHideSplashScreen</key>
-	<true/>
-	<key>ShowSplashScreenSpinner</key>
-	<true/>
-	<key>MediaPlaybackRequiresUserAction</key>
-	<false/>
-	<key>AllowInlineMediaPlayback</key>
-	<false/>
-	<key>OpenAllWhitelistURLsInWebView</key>
-	<false/>
-	<key>BackupWebStorage</key>
-	<true/>
-	<key>ExternalHosts</key>
-	<array/>
-	<key>Plugins</key>
-	<dict>
-		<key>Device</key>
-		<string>CDVDevice</string>
-		<key>Logger</key>
-		<string>CDVLogger</string>
-		<key>Compass</key>
-		<string>CDVLocation</string>
-		<key>Accelerometer</key>
-		<string>CDVAccelerometer</string>
-		<key>Camera</key>
-		<string>CDVCamera</string>
-		<key>NetworkStatus</key>
-		<string>CDVConnection</string>
-		<key>Contacts</key>
-		<string>CDVContacts</string>
-		<key>Debug Console</key>
-		<string>CDVDebugConsole</string>
-		<key>File</key>
-		<string>CDVFile</string>
-		<key>FileTransfer</key>
-		<string>CDVFileTransfer</string>
-		<key>Geolocation</key>
-		<string>CDVLocation</string>
-		<key>Notification</key>
-		<string>CDVNotification</string>
-		<key>Media</key>
-		<string>CDVSound</string>
-		<key>Capture</key>
-		<string>CDVCapture</string>
-		<key>SplashScreen</key>
-		<string>CDVSplashScreen</string>
-		<key>Echo</key>
-		<string>CDVEcho</string>
-		<key>Battery</key>
-		<string>CDVBattery</string>
-	</dict>
-</dict>
-</plist>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibApp/CordovaLibApp-Info.plist
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/CordovaLibApp-Info.plist b/CordovaLib/CordovaLibApp/CordovaLibApp-Info.plist
deleted file mode 100644
index 6c21097..0000000
--- a/CordovaLib/CordovaLibApp/CordovaLibApp-Info.plist
+++ /dev/null
@@ -1,45 +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>CFBundleIdentifier</key>
-	<string>org.apache.cordova.cordovalibapptests.${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>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibApp/CordovaLibApp-Prefix.pch
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/CordovaLibApp-Prefix.pch b/CordovaLib/CordovaLibApp/CordovaLibApp-Prefix.pch
deleted file mode 100644
index 15a9617..0000000
--- a/CordovaLib/CordovaLibApp/CordovaLibApp-Prefix.pch
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-#
-*/
-
-//
-// Prefix header for all source files of the 'CordovaLibAppTests' target in the 'CordovaLibAppTests' project
-//
-
-#import <Availability.h>
-
-#ifndef __IPHONE_4_0
-#warning "This project uses features only available in iOS SDK 4.0 and later."
-#endif
-
-#ifdef __OBJC__
-    #import <UIKit/UIKit.h>
-    #import <Foundation/Foundation.h>
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibApp/ViewController.h
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/ViewController.h b/CordovaLib/CordovaLibApp/ViewController.h
deleted file mode 100644
index befeaae..0000000
--- a/CordovaLib/CordovaLibApp/ViewController.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 "CDVViewController.h"
-
-@interface ViewController : CDVViewController
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibApp/ViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/ViewController.m b/CordovaLib/CordovaLibApp/ViewController.m
deleted file mode 100644
index 81be8ec..0000000
--- a/CordovaLib/CordovaLibApp/ViewController.m
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 "ViewController.h"
-
-@interface ViewController ()
-
-@end
-
-@implementation ViewController
-
-- (void)viewWillAppear:(BOOL)animated
-{
-    // Set the main view to utilize the entire application frame space of the device.
-    // Change this to suit your view's UI footprint needs in your application.
-    self.view.frame = [[UIScreen mainScreen] applicationFrame];
-
-    [super viewWillAppear:animated];
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    // Do any additional setup after loading the view, typically from a nib.
-}
-
-- (void)viewDidUnload
-{
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-}
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-    return [super shouldAutorotateToInterfaceOrientation:interfaceOrientation];
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibApp/en.lproj/InfoPlist.strings
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/en.lproj/InfoPlist.strings b/CordovaLib/CordovaLibApp/en.lproj/InfoPlist.strings
deleted file mode 100644
index 01d5c8c..0000000
--- a/CordovaLib/CordovaLibApp/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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.
- */
-/* Localized versions of Info.plist keys */
-

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibApp/main.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/main.m b/CordovaLib/CordovaLibApp/main.m
deleted file mode 100644
index 120ac53..0000000
--- a/CordovaLib/CordovaLibApp/main.m
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 "AppDelegate.h"
-
-int main(int argc, char* argv[])
-{
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibApp/www/index.html
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/www/index.html b/CordovaLib/CordovaLibApp/www/index.html
deleted file mode 100644
index f7ffdf0..0000000
--- a/CordovaLib/CordovaLibApp/www/index.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html>
-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-#
--->
-  <head>
-  <title></title>
-  
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no;" />
-	<meta charset="utf-8">
-
-
-	<!-- iPad/iPhone specific css below, add after your main css >
-	<link rel="stylesheet" media="only screen and (max-device-width: 1024px)" href="ipad.css" type="text/css" />		
-	<link rel="stylesheet" media="only screen and (max-device-width: 480px)" href="iphone.css" type="text/css" />		
-	-->
-	<!-- If your application is targeting iOS BEFORE 4.0 you MUST put json2.js from http://www.JSON.org/json2.js into your www directory and include it here -->
-	<script type="text/javascript" charset="utf-8" src="cordova.ios.js"></script>
-    <script type="text/javascript">
-
-
-	// If you want to prevent dragging, uncomment this section
-	/*
-	function preventBehavior(e) 
-	{ 
-      e.preventDefault(); 
-    };
-	document.addEventListener("touchmove", preventBehavior, false);
-	*/
-	
-	/* If you are supporting your own protocol, the var invokeString will contain any arguments to the app launch.
-	see http://iphonedevelopertips.com/cocoa/launching-your-own-application-via-a-custom-url-scheme.html
-	for more details -jm */
-	/*
-	function handleOpenURL(url)
-	{
-		// TODO: do something with the url passed in.
-	}
-	*/
-	
-	function onBodyLoad()
-	{		
-		document.addEventListener("deviceready", onDeviceReady, false);
-	}
-	
-	/* When this function is called, Cordova has been initialized and is ready to roll */
-	/* If you are supporting your own protocol, the var invokeString will contain any arguments to the app launch.
-	see http://iphonedevelopertips.com/cocoa/launching-your-own-application-via-a-custom-url-scheme.html
-	for more details -jm */
-	function onDeviceReady()
-	{
-    // Used by unit tests to tell when the page is loaded.
-    window.pageIsLoaded = true;
-		// do your thing!
-		navigator.notification.alert("Cordova is working")        
-	}
-    
-    </script>
-  </head>
-  <body onload="onBodyLoad()">
-	<h1>Hey, it's Cordova!</h1>
-	<ol>
-		<li>Check your console log for any white-list rejection errors.</li>
-		<li>Add your allowed <strong>hosts</strong> in Cordova.plist/ExternalHosts (wildcards OK, don't enter the URL scheme)</li>
-	</ol>
-  </body>
-</html>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CDVBase64Tests.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CDVBase64Tests.m b/CordovaLib/CordovaLibTests/CDVBase64Tests.m
deleted file mode 100644
index 70fb38e..0000000
--- a/CordovaLib/CordovaLibTests/CDVBase64Tests.m
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 <SenTestingKit/SenTestingKit.h>
-
-#import "NSData+Base64.h"
-
-@interface CDVBase64Tests : SenTestCase
-@end
-
-@implementation CDVBase64Tests
-
-- (void)setUp
-{
-    [super setUp];
-
-    // setup code here
-}
-
-- (void)tearDown
-{
-    // Tear-down code here.
-
-    [super tearDown];
-}
-
-- (void)testBase64Encode
-{
-    NSString* decodedString = @"abcdefghijklmnopqrstuvwxyz1234567890!@#$%^&";
-    NSData* decodedData = [decodedString dataUsingEncoding:NSUTF8StringEncoding];
-
-    NSString* expectedEncodedString = @"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwIUAjJCVeJg==";
-    NSString* actualEncodedString = [decodedData base64EncodedString];
-
-    STAssertTrue([expectedEncodedString isEqualToString:actualEncodedString], nil);
-}
-
-- (void)testBase64Decode
-{
-    NSString* encodedString = @"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY3ODkwIUAjJCVeJg==";
-    NSString* decodedString = @"abcdefghijklmnopqrstuvwxyz1234567890!@#$%^&";
-    NSData* encodedData = [decodedString dataUsingEncoding:NSUTF8StringEncoding];
-    NSData* decodedData = [NSData dataFromBase64String:encodedString];
-
-    STAssertTrue([encodedData isEqualToData:decodedData], nil);
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CDVContactsTests.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CDVContactsTests.m b/CordovaLib/CordovaLibTests/CDVContactsTests.m
deleted file mode 100644
index f239bba..0000000
--- a/CordovaLib/CordovaLibTests/CDVContactsTests.m
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 <SenTestingKit/SenTestingKit.h>
-
-#import "CDVWebViewTest.h"
-#import "CDVContacts.h"
-
-@interface CDVContactsTests : CDVWebViewTest
-@end
-
-@implementation CDVContactsTests
-
-- (void)setUp
-{
-    [super setUp];
-}
-
-- (void)tearDown
-{
-    [super tearDown];
-}
-
-- (void)testSearchContacts
-{
-    STAssertTrue(NO, @"TODO: testSearchContacts");
-}
-
-- (void)testSaveContact
-{
-    STAssertTrue(NO, @"TODO: testSaveContact");
-}
-
-- (void)testNewContact
-{
-    STAssertTrue(NO, @"TODO: testNewContact");
-}
-
-- (void)testRemoveContact
-{
-    STAssertTrue(NO, @"TODO: testRemoveContact");
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CDVFakeFileManager.h
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CDVFakeFileManager.h b/CordovaLib/CordovaLibTests/CDVFakeFileManager.h
deleted file mode 100644
index 41e5523..0000000
--- a/CordovaLib/CordovaLibTests/CDVFakeFileManager.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 <Foundation/Foundation.h>
-
-typedef BOOL (^CDVFileExistsBlock)(NSString*);
-
-// Used in place of an NSFileManager for unit tests. It implements only those functions
-// which are required by the tests that use it.
-@interface CDVFakeFileManager : NSObject {
-    @private
-    CDVFileExistsBlock _fileExistsBlock;
-}
-
-- (id)initWithFileExistsBlock:(CDVFileExistsBlock)fileExistsBlock;
-+ (id)managerWithFileExistsBlock:(CDVFileExistsBlock)fileExistsBlock;
-
-- (BOOL)fileExistsAtPath:(NSString*)path;
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CDVFakeFileManager.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CDVFakeFileManager.m b/CordovaLib/CordovaLibTests/CDVFakeFileManager.m
deleted file mode 100644
index 1aa7f12..0000000
--- a/CordovaLib/CordovaLibTests/CDVFakeFileManager.m
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 "CDVFakeFileManager.h"
-
-@implementation CDVFakeFileManager
-
-- (id)initWithFileExistsBlock:(CDVFileExistsBlock)fileExistsBlock
-{
-    self = [super init];
-    if (self != nil) {
-        _fileExistsBlock = [fileExistsBlock copy];
-    }
-    return self;
-}
-
-- (void)dealloc
-{
-    [_fileExistsBlock release];
-    [super dealloc];
-}
-
-+ (id)managerWithFileExistsBlock:(CDVFileExistsBlock)fileExistsBlock
-{
-    return [[[CDVFakeFileManager alloc] initWithFileExistsBlock:fileExistsBlock] autorelease];
-}
-
-- (BOOL)fileExistsAtPath:(NSString*)path
-{
-    return _fileExistsBlock(path);
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CDVFileTransferTests.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CDVFileTransferTests.m b/CordovaLib/CordovaLibTests/CDVFileTransferTests.m
deleted file mode 100644
index 4f1c617..0000000
--- a/CordovaLib/CordovaLibTests/CDVFileTransferTests.m
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 <SenTestingKit/SenTestingKit.h>
-
-#import "CDV.h"
-
-static NSString* const kDummyArgCallbackId = @"cid0";
-static NSString* const kDummyArgFileKey = @"image.jpg";
-static NSString* const kDummyArgTarget = @"/path/to/image.jpg";
-static NSString* const kDummyArgServer = @"http://apache.org";
-static NSString* const kDummyFileContents = @"0123456789";
-
-// Reads the given stream and returns the contents as an NSData.
-static NSData *readStream(NSInputStream* stream)
-{
-    static const NSUInteger kBufferSize = 1024;
-
-    UInt8* buffer = malloc(kBufferSize);
-    NSMutableData* streamData = [NSMutableData data];
-
-    [stream open];
-
-    for (;; ) {
-        NSInteger read = [stream read:buffer maxLength:kBufferSize];
-        if (read > 0) {
-            [streamData appendBytes:buffer length:read];
-        } else {
-            break;
-        }
-    }
-
-    free(buffer);
-    [stream close];
-    return streamData;
-}
-
-@interface CDVFileTransferTests : SenTestCase {
-    NSMutableArray* _arguments;
-    CDVFileTransfer* _fileTransfer;
-    NSData* _dummyFileData;
-}
-@end
-
-@implementation CDVFileTransferTests
-
-- (void)setUp
-{
-    [super setUp];
-
-    _arguments = [[NSMutableArray alloc] initWithObjects:
-        kDummyArgTarget, kDummyArgServer, kDummyArgFileKey, [NSNull null],
-        [NSNull null], [NSNull null], [NSNull null], [NSNull null], [NSNull null], nil];
-    _dummyFileData = [[kDummyFileContents dataUsingEncoding:NSUTF8StringEncoding] retain];
-    _fileTransfer = [[CDVFileTransfer alloc] init];
-}
-
-- (void)tearDown
-{
-    [_arguments release];
-    _arguments = nil;
-    [_dummyFileData release];
-    _dummyFileData = nil;
-    [_fileTransfer release];
-    _fileTransfer = nil;
-    [super tearDown];
-}
-
-- (void)setFilePathArg:(NSString*)filePath
-{
-    [_arguments replaceObjectAtIndex:0 withObject:filePath];
-}
-
-- (void)setServerUrlArg:(NSString*)serverUrl
-{
-    [_arguments replaceObjectAtIndex:1 withObject:serverUrl];
-}
-
-- (void)setChunkedModeArg:(BOOL)chunk
-{
-    [_arguments replaceObjectAtIndex:7 withObject:[NSNumber numberWithBool:chunk]];
-}
-
-- (void)setParams:(NSDictionary*)params
-{
-    [_arguments replaceObjectAtIndex:5 withObject:params];
-}
-
-- (void)setHeaders:(NSDictionary*)headers
-{
-    [_arguments replaceObjectAtIndex:8 withObject:headers];
-}
-
-- (NSURLRequest*)requestForUpload
-{
-    CDVInvokedUrlCommand* command = [[[CDVInvokedUrlCommand alloc] initWithArguments:_arguments
-                                                                          callbackId:kDummyArgCallbackId
-                                                                           className:@"FileTransfer"
-                                                                          methodName:@"upload"] autorelease];
-
-    return [_fileTransfer requestForUploadCommand:command fileData:_dummyFileData];
-}
-
-- (void)checkUploadRequest:(NSURLRequest*)request chunked:(BOOL)chunked
-{
-    STAssertTrue([@"POST" isEqualToString:[request HTTPMethod]], nil);
-    NSData* payloadData = nil;
-    if (chunked) {
-        STAssertNil([request HTTPBody], nil);
-        STAssertNotNil([request HTTPBodyStream], nil);
-        payloadData = readStream([request HTTPBodyStream]);
-    } else {
-        STAssertNotNil([request HTTPBody], nil);
-        STAssertNil([request HTTPBodyStream], nil);
-        payloadData = [request HTTPBody];
-    }
-    STAssertNotNil([request valueForHTTPHeaderField:@"X-Requested-With"], nil);
-    NSUInteger contentLength = [[request valueForHTTPHeaderField:@"Content-Length"] intValue];
-    STAssertEquals([payloadData length], contentLength, nil);
-}
-
-- (void)testEscapePathComponentForUrlString
-{
-    STAssertTrue([@"" isEqualToString:
-            [_fileTransfer escapePathComponentForUrlString:@""]], nil);
-    STAssertTrue([@"foo" isEqualToString:
-            [_fileTransfer escapePathComponentForUrlString:@"foo"]], nil);
-    STAssertTrue([@"http://a.org/spa%20ce%25" isEqualToString:
-            [_fileTransfer escapePathComponentForUrlString:@"http://a.org/spa ce%"]], nil);
-    STAssertTrue([@"http://a.org/spa%20ce%25/" isEqualToString:
-            [_fileTransfer escapePathComponentForUrlString:@"http://a.org/spa ce%/"]], nil);
-    STAssertTrue([@"http://a.org/%25/%25/" isEqualToString:
-            [_fileTransfer escapePathComponentForUrlString:@"http://a.org/%/%/"]], nil);
-}
-
-- (void)testUpload_invalidServerUrl
-{
-    [self setServerUrlArg:@"invalid url"];
-    STAssertNil([self requestForUpload], nil);
-}
-
-- (void)testUpload_missingFileData
-{
-    [_dummyFileData release];
-    _dummyFileData = nil;
-    STAssertNil([self requestForUpload], nil);
-}
-
-- (void)testUpload_serverUrlPathEscaping
-{
-    [self setServerUrlArg:[_fileTransfer escapePathComponentForUrlString:@"http://apache.org/spa ce%"]]; // uri encode first now
-    NSURLRequest* request = [self requestForUpload];
-    STAssertTrue([[[request URL] absoluteString] isEqualToString:@"http://apache.org/spa%20ce%25"], nil);
-}
-
-- (void)testUpload_nonChunked
-{
-    [self setChunkedModeArg:NO];
-    NSURLRequest* request = [self requestForUpload];
-    [self checkUploadRequest:request chunked:NO];
-}
-
-- (void)testUpload_chunked
-{
-    // As noted in the implementation, chunked upload is disabled pre 5.0.
-    if (!IsAtLeastiOSVersion(@"5.0")) {
-        return;
-    }
-    // Chunked is the default.
-    NSURLRequest* request = [self requestForUpload];
-    [self checkUploadRequest:request chunked:YES];
-}
-
-- (void)testUpload_withParams
-{
-    [self setChunkedModeArg:NO];
-    NSDictionary* params = [NSDictionary dictionaryWithObjectsAndKeys:@"cookieval", kOptionsKeyCookie,
-        @"val3", @"key3", nil];
-    [self setParams:params];
-    NSURLRequest* request = [self requestForUpload];
-    NSString* payload = [[[NSString alloc] initWithData:[request HTTPBody] encoding:NSUTF8StringEncoding] autorelease];
-    // Check that the cookie is set, and that it is not in the payload like others in the options dict.
-    STAssertTrue([@"cookieval" isEqualToString:[request valueForHTTPHeaderField:@"Cookie"]], nil);
-    STAssertEquals([payload rangeOfString:@"cookieval"].length, 0U, nil);
-    // Check that key3 is in the payload.
-    STAssertTrue([payload rangeOfString:@"key3"].length > 0, nil);
-    STAssertTrue([payload rangeOfString:@"val3"].length > 0, nil);
-}
-
-- (void)testUpload_withHeaders
-{
-    [self setChunkedModeArg:NO];
-    [self setHeaders:[NSDictionary dictionaryWithObjectsAndKeys:@"val1", @"key1",
-            [NSArray arrayWithObjects:@"val2a", @"val2b", nil], @"key2", [NSNull null], @"X-Requested-With", nil]];
-    NSURLRequest* request = [self requestForUpload];
-    STAssertTrue([@"val1" isEqualToString:[request valueForHTTPHeaderField:@"key1"]], nil);
-    STAssertTrue([@"val2a,val2b" isEqualToString:[request valueForHTTPHeaderField:@"key2"]], nil);
-    STAssertTrue([@"null" isEqualToString:[request valueForHTTPHeaderField:@"X-Requested-With"]], nil);
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CDVInvokedUrlCommandTests.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CDVInvokedUrlCommandTests.m b/CordovaLib/CordovaLibTests/CDVInvokedUrlCommandTests.m
deleted file mode 100644
index a2366fb..0000000
--- a/CordovaLib/CordovaLibTests/CDVInvokedUrlCommandTests.m
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 <SenTestingKit/SenTestingKit.h>
-
-#import "CDVInvokedUrlCommand.h"
-
-@interface CDVInvokedUrlCommandTests : SenTestCase
-@end
-
-@implementation CDVInvokedUrlCommandTests
-
-- (void)testInitWithNoArgs
-{
-    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);
-}
-
-- (void)testLegacyArgsNoDict
-{
-    NSArray* args = [NSArray arrayWithObjects:@"a", @"b", nil];
-    NSArray* jsonArr = [NSArray arrayWithObjects:@"callbackId", @"className", @"methodName", args, nil];
-    CDVInvokedUrlCommand* command = [CDVInvokedUrlCommand commandFromJson:jsonArr];
-    NSMutableArray* legacyArgs = nil;
-    NSMutableDictionary* dict = nil;
-
-    [command legacyArguments:&legacyArgs andDict:&dict];
-    // Ensure properties don't change.
-    STAssertEquals(@"callbackId", command.callbackId, nil);
-    STAssertEquals(@"className", command.className, nil);
-    STAssertEquals(@"methodName", command.methodName, nil);
-    STAssertEquals(args, command.arguments, nil);
-
-    NSArray* expected = [NSArray arrayWithObjects:@"callbackId", @"a", @"b", nil];
-    STAssertEqualObjects(expected, legacyArgs, nil);
-    STAssertNil(dict, nil);
-}
-
-- (void)testLegacyArgsWithDicts
-{
-    NSDictionary* dummyDict1 = [NSDictionary dictionaryWithObjectsAndKeys:@"val", @"key", nil];
-    NSDictionary* dummyDict2 = [NSDictionary dictionaryWithObjectsAndKeys:@"val", @"key", nil];
-    NSArray* args = [NSArray arrayWithObjects:@"a", dummyDict1, dummyDict2, @"b", nil];
-    NSArray* jsonArr = [NSArray arrayWithObjects:@"callbackId", @"className", @"methodName", args, nil];
-    CDVInvokedUrlCommand* command = [CDVInvokedUrlCommand commandFromJson:jsonArr];
-    NSMutableArray* legacyArgs = nil;
-    NSMutableDictionary* dict = nil;
-
-    [command legacyArguments:&legacyArgs andDict:&dict];
-    // Ensure properties don't change.
-    STAssertEquals(@"callbackId", command.callbackId, nil);
-    STAssertEquals(@"className", command.className, nil);
-    STAssertEquals(@"methodName", command.methodName, nil);
-    STAssertEquals(args, command.arguments, nil);
-
-    NSArray* expected = [NSArray arrayWithObjects:@"callbackId", @"a", dummyDict2, @"b", nil];
-    STAssertEqualObjects(expected, legacyArgs, nil);
-    STAssertEqualObjects(dict, dummyDict1, nil);
-}
-
-- (void)testLegacyArgsNoCallbackId
-{
-    NSArray* args = [NSArray arrayWithObjects:@"a", @"b", nil];
-    NSArray* jsonArr = [NSArray arrayWithObjects:[NSNull null], @"className", @"methodName", args, nil];
-    CDVInvokedUrlCommand* command = [CDVInvokedUrlCommand commandFromJson:jsonArr];
-    NSMutableArray* legacyArgs = nil;
-    NSMutableDictionary* dict = nil;
-
-    [command legacyArguments:&legacyArgs andDict:&dict];
-
-    NSArray* expected = [NSArray arrayWithObjects:@"a", @"b", nil];
-    STAssertEqualObjects(expected, legacyArgs, nil);
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CDVLocalStorageTests.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CDVLocalStorageTests.m b/CordovaLib/CordovaLibTests/CDVLocalStorageTests.m
deleted file mode 100644
index 91bfbd2..0000000
--- a/CordovaLib/CordovaLibTests/CDVLocalStorageTests.m
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 <SenTestingKit/SenTestingKit.h>
-
-#import "CDVLocalStorage.h"
-#import "CDVWebViewTest.h"
-#import "CDVFakeFileManager.h"
-#import "ViewController.h"
-
-@interface CDVLocalStorageTests : CDVWebViewTest
-                                  // Deletes LocalStorage files from disk.
-- (void)deleteOriginals:(BOOL)originals backups:(BOOL)backups;
-// Returns the CDVLocalStorage instance from the plugins dict.
-- (CDVLocalStorage*)localStorage;
-@end
-
-@implementation CDVLocalStorageTests
-
-- (void)setUp
-{
-    [super setUp];
-    // Clear these on setUp as well in case they were left around.
-    [self deleteOriginals:YES backups:YES];
-}
-
-- (void)tearDown
-{
-    // Don't leave any localStorage files around.
-    [self deleteOriginals:YES backups:YES];
-    [super tearDown];
-}
-
-- (CDVLocalStorage*)localStorage
-{
-    return [self pluginForClass:[CDVLocalStorage class]];
-}
-
-- (void)deleteOriginals:(BOOL)originals backups:(BOOL)backups
-{
-    NSFileManager* fileManager = [NSFileManager defaultManager];
-
-    for (CDVBackupInfo* info in [self localStorage].backupInfo) {
-        if (originals) {
-            [fileManager removeItemAtPath:info.original error:nil];
-        }
-        if (backups) {
-            [fileManager removeItemAtPath:info.backup error:nil];
-        }
-    }
-}
-
-- (void)testBackupAndRestore
-{
-    CDVLocalStorage* localStorage = [self localStorage];
-
-    [self waitForConditionName:@"shouldBackup" block:^{
-            [self evalJs:@"localStorage.setItem('foo', 'bar')"];
-            return [localStorage shouldBackup];
-        }];
-    [localStorage backup:[CDVInvokedUrlCommand new]];
-    STAssertFalse([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
-    // the WebView maintains an in-memory cache of what's in LocalStorage even
-    // after we delete the underlying files and recreate the view.
-
-    // Instead, we just test the file copying logic.
-    [self deleteOriginals:YES backups:NO];
-    STAssertTrue([localStorage shouldRestore], @"Should restore after deleting originals");
-    [localStorage restore:[CDVInvokedUrlCommand new]];
-    STAssertFalse([localStorage shouldRestore], @"Restore did not complete successfully");
-}
-
-- (void)testVerifyAndFixDatabaseLocations_noChangeRequired
-{
-    NSString* const kBundlePath = @"/bpath";
-    id fakeFileManager = [CDVFakeFileManager managerWithFileExistsBlock:^(NSString * path) {
-            STFail (@"fileExists called.");
-            return NO;
-        }];
-    NSMutableDictionary* appPlistDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-        @"/bpath/foo", @"WebKitLocalStorageDatabasePathPreferenceKey",
-        @"/bpath/foo", @"WebDatabaseDirectory",
-        nil];
-    BOOL modified = [CDVLocalStorage __verifyAndFixDatabaseLocationsWithAppPlistDict:appPlistDict
-                                                                          bundlePath:kBundlePath
-                                                                         fileManager:fakeFileManager];
-
-    STAssertFalse (modified, @"Should not have applied fix.");
-}
-
-- (void)testVerifyAndFixDatabaseLocations_changeRequired1
-{
-    NSString* const kBundlePath = @"/bpath";
-    id fakeFileManager = [CDVFakeFileManager managerWithFileExistsBlock:^(NSString * path) {
-            return YES;
-        }];
-    NSMutableDictionary* appPlistDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-        @"/foo", @"WebKitLocalStorageDatabasePathPreferenceKey",
-        nil];
-    BOOL modified = [CDVLocalStorage __verifyAndFixDatabaseLocationsWithAppPlistDict:appPlistDict
-                                                                          bundlePath:kBundlePath
-                                                                         fileManager:fakeFileManager];
-
-    STAssertTrue (modified, @"Should have applied fix.");
-    NSString* newPath = [appPlistDict objectForKey:@"WebKitLocalStorageDatabasePathPreferenceKey"];
-    STAssertTrue ([@"/bpath/Library/Caches" isEqualToString:newPath], nil);
-}
-
-- (void)testVerifyAndFixDatabaseLocations_changeRequired2
-{
-    NSString* const kBundlePath = @"/bpath";
-    id fakeFileManager = [CDVFakeFileManager managerWithFileExistsBlock:^(NSString * path) {
-            return NO;
-        }];
-    NSMutableDictionary* appPlistDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-        @"/foo", @"WebDatabaseDirectory",
-        nil];
-    BOOL modified = [CDVLocalStorage __verifyAndFixDatabaseLocationsWithAppPlistDict:appPlistDict
-                                                                          bundlePath:kBundlePath
-                                                                         fileManager:fakeFileManager];
-
-    STAssertTrue (modified, @"Should have applied fix.");
-    NSString* newPath = [appPlistDict objectForKey:@"WebDatabaseDirectory"];
-    STAssertTrue ([@"/bpath/Library/WebKit" isEqualToString:newPath], nil);
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CDVPluginResultJSONSerializationTests.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CDVPluginResultJSONSerializationTests.m b/CordovaLib/CordovaLibTests/CDVPluginResultJSONSerializationTests.m
deleted file mode 100644
index f02ff71..0000000
--- a/CordovaLib/CordovaLibTests/CDVPluginResultJSONSerializationTests.m
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 <Foundation/Foundation.h>
-#import <SenTestingKit/SenTestingKit.h>
-
-#import "CDVPluginResult.h"
-#import "JSONKit.h"
-
-@interface CDVPluginResultJSONSerializationTests : SenTestCase
-@end
-
-@implementation CDVPluginResultJSONSerializationTests
-
-- (void)testSerializingMessageAsInt
-{
-    CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsInt:5];
-    NSDictionary* dic = [[result toJSONString] cdvjk_objectFromJSONString];
-    NSNumber* message = [dic objectForKey:@"message"];
-
-    STAssertTrue([[NSNumber numberWithInt:5] isEqual:message], nil);
-}
-
-- (void)testSerializingMessageAsDouble
-{
-    CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDouble:5.5];
-    NSDictionary* dic = [[result toJSONString] cdvjk_objectFromJSONString];
-    NSNumber* message = [dic objectForKey:@"message"];
-
-    STAssertTrue([[NSNumber numberWithDouble:5.5] isEqual:message], nil);
-}
-
-- (void)testSerializingMessageAsArray
-{
-    NSArray* testValues = [NSArray arrayWithObjects:
-        [NSNull null],
-        @"string",
-        [NSNumber numberWithInt:5],
-        [NSNumber numberWithDouble:5.5],
-        [NSNumber numberWithBool:true],
-        nil];
-
-    CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsArray:testValues];
-    NSDictionary* dic = [[result toJSONString] cdvjk_objectFromJSONString];
-    NSArray* message = [dic objectForKey:@"message"];
-
-    STAssertTrue([message isKindOfClass:[NSArray class]], nil);
-    STAssertTrue([testValues count] == [message count], nil);
-
-    for (NSInteger i = 0; i < [testValues count]; i++) {
-        STAssertTrue([[testValues objectAtIndex:i] isEqual:[message objectAtIndex:i]], nil);
-    }
-}
-
-- (void)__testDictionary:(NSDictionary*)dictA withDictionary:(NSDictionary*)dictB
-{
-    STAssertTrue([dictA isKindOfClass:[NSDictionary class]], nil);
-    STAssertTrue([dictB isKindOfClass:[NSDictionary class]], nil);
-
-    STAssertTrue([[dictA allKeys] count] == [[dictB allKeys] count], nil);
-
-    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
-        if ([objA isKindOfClass:[NSDictionary class]]) {
-            [self __testDictionary:objA withDictionary:objB];
-        } else {
-            STAssertTrue([objA isEqual:objB], nil); // key's value equality
-        }
-    }
-}
-
-- (void)testSerializingMessageAsDictionary
-{
-    NSMutableDictionary* testValues = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-        [NSNull null], @"nullItem",
-        @"string", @"stringItem",
-        [NSNumber numberWithInt:5], @"intItem",
-        [NSNumber numberWithDouble:5.5], @"doubleItem",
-        [NSNumber numberWithBool:true], @"boolItem",
-        nil];
-
-    NSDictionary* nestedDict = [testValues copy];
-
-    [testValues setValue:nestedDict forKey:@"nestedDict"];
-
-    CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:testValues];
-    NSDictionary* dic = [[result toJSONString] cdvjk_objectFromJSONString];
-    NSDictionary* message = [dic objectForKey:@"message"];
-
-    [self __testDictionary:testValues withDictionary:message];
-}
-
-- (void)testSerializingMessageAsErrorCode
-{
-    NSMutableDictionary* testValues = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-        [NSNumber numberWithInt:1], @"code",
-        nil];
-
-    CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageToErrorObject:1];
-    NSDictionary* dic = [[result toJSONString] cdvjk_objectFromJSONString];
-    NSDictionary* message = [dic objectForKey:@"message"];
-
-    [self __testDictionary:testValues withDictionary:message];
-}
-
-- (void)testSerializingMessageAsStringContainingQuotes
-{
-    NSString* quotedString = @"\"quoted\"";
-    CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:quotedString];
-    NSDictionary* dic = [[result toJSONString] cdvjk_objectFromJSONString];
-    NSString* message = [dic objectForKey:@"message"];
-
-    STAssertTrue([quotedString isEqual:message], nil);
-}
-
-- (void)testSerializingMessageAsStringThatIsNil
-{
-    NSString* nilString = nil;
-    CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nilString];
-    NSDictionary* dic = [[result toJSONString] cdvjk_objectFromJSONString];
-    NSString* message = [dic objectForKey:@"message"];
-
-    STAssertTrue([[NSNull null] isEqual:message], nil);
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CDVWebViewTest.h
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CDVWebViewTest.h b/CordovaLib/CordovaLibTests/CDVWebViewTest.h
deleted file mode 100644
index 7bda31f..0000000
--- a/CordovaLib/CordovaLibTests/CDVWebViewTest.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 <SenTestingKit/SenTestingKit.h>
-
-@class AppDelegate;
-@class CDVViewController;
-
-@interface CDVWebViewTest : SenTestCase
-
-@property (nonatomic, strong) UIWebView* webView;
-
-- (AppDelegate*)appDelegate;
-- (CDVViewController*)viewController;
-- (UIWebView*)webView;
-
-// Returns the already registered plugin object for the given class.
-- (id)pluginForClass:(Class)cls;
-// Destroys the existing webview and creates a new one.
-- (void)reloadWebView;
-// Runs the run loop until the given block returns true, or until a timeout
-// occurs.
-- (void)waitForConditionName:(NSString*)conditionName block:(BOOL (^)())block;
-// Convenience function for stringByEvaluatingJavaScriptFromString.
-- (NSString*)evalJs:(NSString*)code;
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CDVWebViewTest.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CDVWebViewTest.m b/CordovaLib/CordovaLibTests/CDVWebViewTest.m
deleted file mode 100644
index d97ee95..0000000
--- a/CordovaLib/CordovaLibTests/CDVWebViewTest.m
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 "CDVWebViewTest.h"
-
-#import "AppDelegate.h"
-#import "ViewController.h"
-
-@interface CDVWebViewTest ()
-// Runs the run loop until the webview has finished loading.
-- (void)waitForPageLoad;
-@end
-
-@implementation CDVWebViewTest
-
-@synthesize webView;
-
-- (void)setUp
-{
-    [super setUp];
-    // Stop tests on the first failed assertion. Having the test stop on the
-    // 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];
-}
-
-- (void)tearDown
-{
-    // Enforce that the view controller is released between tests to ensure
-    // tests don't affect each other.
-    [self.appDelegate destroyViewController];
-    [super tearDown];
-}
-
-- (AppDelegate*)appDelegate
-{
-    return [[UIApplication sharedApplication] delegate];
-}
-
-- (CDVViewController*)viewController
-{
-    // Lazily create the view controller so that tests that do not require it
-    // are not slowed down by it.
-    if (self.appDelegate.viewController == nil) {
-        [self.appDelegate createViewController];
-        // Things break if tearDown is called before the page has finished
-        // loading (a JS error happens and an alert pops up), so enforce a wait
-        // here.
-        [self waitForPageLoad];
-    }
-    STAssertNotNil(self.appDelegate.viewController, @"createViewController failed");
-    return self.appDelegate.viewController;
-}
-
-- (UIWebView*)webView
-{
-    return self.viewController.webView;
-}
-
-- (id)pluginForClass:(Class)cls
-{
-    NSString* className = NSStringFromClass(cls);
-    id ret = [self.viewController.pluginObjects objectForKey:className];
-
-    STAssertNotNil(ret, @"Missing plugin %@", className);
-    return ret;
-}
-
-- (void)reloadWebView
-{
-    [self.appDelegate destroyViewController];
-    [self.appDelegate createViewController];
-}
-
-- (void)waitForConditionName:(NSString*)conditionName block:(BOOL (^)())block
-{
-    // Number of seconds to wait for a condition to become true before giving up.
-    const NSTimeInterval kConditionTimeout = 5.0;
-    // Useful when debugging so that it does not timeout after one loop.
-    const int kMinIterations = 4;
-
-    NSDate* startTime = [NSDate date];
-    int i = 0;
-
-    while (!block()) {
-        [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
-        NSTimeInterval elapsed = -[startTime timeIntervalSinceNow];
-        STAssertTrue(i < kMinIterations || elapsed < kConditionTimeout,
-            @"Timed out waiting for condition %@", conditionName);
-        ++i;
-    }
-}
-
-- (void)waitForPageLoad
-{
-    [self waitForConditionName:@"PageLoad" block:^{
-            return [@"true" isEqualToString:[self evalJs:@"window.pageIsLoaded"]];
-        }];
-}
-
-- (NSString*)evalJs:(NSString*)code
-{
-    return [self.webView stringByEvaluatingJavaScriptFromString:code];
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CDVWhitelistTests.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CDVWhitelistTests.m b/CordovaLib/CordovaLibTests/CDVWhitelistTests.m
deleted file mode 100644
index cd5cca3..0000000
--- a/CordovaLib/CordovaLibTests/CDVWhitelistTests.m
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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 <SenTestingKit/SenTestingKit.h>
-
-#import "CDVWhitelist.h"
-
-@interface CDVWhitelistTests : SenTestCase
-@end
-
-@implementation CDVWhitelistTests
-
-- (void)setUp
-{
-    [super setUp];
-
-    // setup code here
-}
-
-- (void)tearDown
-{
-    // Tear-down code here.
-
-    [super tearDown];
-}
-
-- (void)testAllowedSchemes
-{
-    NSArray* allowedHosts = [NSArray arrayWithObjects:
-        @"*.apache.org",
-        nil];
-
-    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);
-}
-
-- (void)testSubdomainWildcard
-{
-    NSArray* allowedHosts = [NSArray arrayWithObjects:
-        @"*.apache.org",
-        nil];
-
-    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);
-}
-
-- (void)testWildcardInTLD
-{
-    // NOTE: if the user chooses to do this (a wildcard in the TLD, not a wildcard as the TLD), we allow it because we assume they know what they are doing! We don't replace it with known TLDs
-    // This might be applicable for custom TLDs on a local network DNS
-
-    NSArray* allowedHosts = [NSArray arrayWithObjects:
-        @"apache.o*g",
-        nil];
-
-    CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
-
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.ogg"]], nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.foo"]], nil);
-}
-
-- (void)testTLDWildcard
-{
-    NSArray* allowedHosts = [NSArray arrayWithObjects:
-        @"apache.*",
-        nil];
-
-    CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
-
-    NSString* hostname = @"apache";
-
-    NSArray* knownTLDs = [NSArray arrayWithObjects:
-        @"aero", @"asia", @"arpa", @"biz", @"cat",
-        @"com", @"coop", @"edu", @"gov", @"info",
-        @"int", @"jobs", @"mil", @"mobi", @"museum",
-        @"name", @"net", @"org", @"pro", @"tel",
-        @"travel", @"xxx",
-        nil];
-
-    // 26*26 combos
-    NSMutableArray* twoCharCountryCodes = [NSMutableArray arrayWithCapacity:(26 * 26)];
-
-    for (char c0 = 'a'; c0 <= 'z'; ++c0) {
-        for (char c1 = 'a'; c1 <= 'z'; ++c1) {
-            [twoCharCountryCodes addObject:[NSString stringWithFormat:@"%c%c", c0, c1]];
-        }
-    }
-
-    NSMutableArray* shouldPass = [NSMutableArray arrayWithCapacity:[knownTLDs count] + [twoCharCountryCodes count]];
-
-    NSEnumerator* knownTLDEnumerator = [knownTLDs objectEnumerator];
-    NSString* tld = nil;
-
-    while (tld = [knownTLDEnumerator nextObject]) {
-        [shouldPass addObject:[NSURL URLWithString:[NSString stringWithFormat:@"http://%@.%@", hostname, tld]]];
-    }
-
-    NSEnumerator* twoCharCountryCodesEnumerator = [twoCharCountryCodes objectEnumerator];
-    NSString* cc = nil;
-
-    while (cc = [twoCharCountryCodesEnumerator nextObject]) {
-        [shouldPass addObject:[NSURL URLWithString:[NSString stringWithFormat:@"http://%@.%@", hostname, cc]]];
-    }
-
-    NSEnumerator* shouldPassEnumerator = [shouldPass objectEnumerator];
-    NSURL* url = nil;
-
-    while (url = [shouldPassEnumerator nextObject]) {
-        STAssertTrue([whitelist URLIsAllowed:url], @"Url tested :%@", [url description]);
-    }
-
-    STAssertFalse(([whitelist URLIsAllowed:[NSURL URLWithString:[NSString stringWithFormat:@"http://%@.%@", hostname, @"faketld"]]]), nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://unknownhostname.faketld"]], nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://unknownhostname.com"]], nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.apache.org"]], nil);
-}
-
-- (void)testCatchallWildcardOnly
-{
-    NSArray* allowedHosts = [NSArray arrayWithObjects:
-        @"*",
-        nil];
-
-    CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
-
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://build.apache.prg"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://MyDangerousSite.org"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org.SuspiciousSite.com"]], nil);
-}
-
-- (void)testWildcardInHostname
-{
-    NSArray* allowedHosts = [NSArray arrayWithObjects:
-        @"www.*apac*he.org",
-        nil];
-
-    CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
-
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.apache.org"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.apacMAChe.org"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.MACapache.org"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.MACapacMAChe.org"]], nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]], nil);
-}
-
-- (void)testExactMatch
-{
-    NSArray* allowedHosts = [NSArray arrayWithObjects:
-        @"www.apache.org",
-        nil];
-
-    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);
-}
-
-- (void)testWildcardMix
-{
-    NSArray* allowedHosts = [NSArray arrayWithObjects:
-        @"*.apac*he.*",
-        nil];
-
-    CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
-
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://www.apache.org"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apacMAChe.ca"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apacMAChe.museum"]], nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://blahMAChe.museum"]], nil);
-}
-
-- (void)testIpExactMatch
-{
-    NSArray* allowedHosts = [NSArray arrayWithObjects:
-        @"192.168.1.1",
-        @"192.168.2.1",
-        nil];
-
-    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);
-}
-
-- (void)testIpWildcardMatch
-{
-    NSArray* allowedHosts = [NSArray arrayWithObjects:
-        @"192.168.1.*",
-        @"192.168.2.*",
-        nil];
-
-    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.1.2"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.2.1"]], nil);
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.2.2"]], nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://192.168.3.1"]], nil);
-}
-
-- (void)testHostnameExtraction
-{
-    NSArray* allowedHosts = [NSArray arrayWithObjects:
-        @"http://apache.org/",
-        @"http://apache.org/foo/bar?x=y",
-        @"ftp://apache.org/foo/bar?x=y",
-        @"ftps://apache.org/foo/bar?x=y",
-        @"http://apache.*/foo/bar?x=y",
-        nil];
-
-    CDVWhitelist* whitelist = [[CDVWhitelist alloc] initWithArray:allowedHosts];
-
-    STAssertTrue([whitelist URLIsAllowed:[NSURL URLWithString:@"http://apache.org"]], nil);
-    STAssertFalse([whitelist URLIsAllowed:[NSURL URLWithString:@"http://google.com"]], nil);
-}
-
-@end

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CordovaLibTests-Info.plist
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CordovaLibTests-Info.plist b/CordovaLib/CordovaLibTests/CordovaLibTests-Info.plist
deleted file mode 100644
index a57a78d..0000000
--- a/CordovaLib/CordovaLibTests/CordovaLibTests-Info.plist
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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.
-#
--->
-<!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>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.apache.cordova.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-</dict>
-</plist>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/CordovaLibTests-Prefix.pch
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/CordovaLibTests-Prefix.pch b/CordovaLib/CordovaLibTests/CordovaLibTests-Prefix.pch
deleted file mode 100644
index 059c8de..0000000
--- a/CordovaLib/CordovaLibTests/CordovaLibTests-Prefix.pch
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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.
- */
-//
-// Prefix header for all source files of the 'CordovaLibTests' target in the 'CordovaLibTests' project
-//
-
-#ifdef __OBJC__
-    #import <UIKit/UIKit.h>
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4d003a72/CordovaLib/CordovaLibTests/en.lproj/InfoPlist.strings
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibTests/en.lproj/InfoPlist.strings b/CordovaLib/CordovaLibTests/en.lproj/InfoPlist.strings
deleted file mode 100644
index 01d5c8c..0000000
--- a/CordovaLib/CordovaLibTests/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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.
- */
-/* Localized versions of Info.plist keys */
-


Mime
View raw message