incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [26/34] wp7 commit: updated mobile spec tests for CordovaJS
Date Mon, 09 Apr 2012 22:40:30 GMT
updated mobile spec tests for CordovaJS


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/commit/5bca3c1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/tree/5bca3c1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/diff/5bca3c1a

Branch: refs/heads/master
Commit: 5bca3c1a17fcadc6cecccdcc1f0e79de62543173
Parents: 925c8a9
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Wed Apr 4 18:04:02 2012 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Wed Apr 4 18:04:02 2012 -0700

----------------------------------------------------------------------
 framework/Cordova/Commands/Camera.cs               |    2 +-
 framework/Cordova/Commands/File.cs                 |  172 +-
 framework/CordovaView.xaml.cs                      |    4 +-
 framework/js/cordova-1.6.0-core.js                 |   30 +-
 framework/js/cordova-1.6.0.js                      |   30 +-
 framework/js/cordova.js.base                       |    2 +
 framework/js/network.js                            |   24 +-
 .../CordovaSourceDictionary.xml                    |  172 +-
 .../MobileSpecUnitTests/MobileSpecUnitTests.csproj |   49 +-
 .../www/accelerometer/index.html                   |  138 +
 tests/MobileSpecUnitTests/www/audio/index.html     |  291 ++
 tests/MobileSpecUnitTests/www/autotest/index.html  |  102 +-
 .../www/autotest/pages/accelerometer.html          |   53 +
 .../www/autotest/pages/all.html                    |   65 +
 .../www/autotest/pages/battery.html                |   54 +
 .../www/autotest/pages/camera.html                 |   54 +
 .../www/autotest/pages/capture.html                |   54 +
 .../www/autotest/pages/compass.html                |   54 +
 .../www/autotest/pages/contacts.html               |   54 +
 .../www/autotest/pages/device.html                 |   54 +
 .../www/autotest/pages/file.html                   |   54 +
 .../www/autotest/pages/geolocation.html            |   54 +
 .../www/autotest/pages/media.html                  |   54 +
 .../www/autotest/pages/network.html                |   54 +
 .../www/autotest/pages/notification.html           |   54 +
 .../www/autotest/pages/platform.html               |   54 +
 .../www/autotest/pages/storage.html                |   54 +
 tests/MobileSpecUnitTests/www/autotest/qunit.js    |    6 +-
 .../www/autotest/test-runner.js                    |   28 +-
 .../www/autotest/tests/battery.tests.js            |    7 +
 .../www/autotest/tests/camera.tests.js             |   46 +-
 .../www/autotest/tests/capture.tests.js            |   37 +-
 .../www/autotest/tests/compass.tests.js            |  105 +-
 .../www/autotest/tests/contacts.tests.js           |  531 ++-
 .../www/autotest/tests/device.tests.js             |    7 +-
 .../www/autotest/tests/file.tests.js               | 2568 ++++++++-------
 .../www/autotest/tests/geolocation.tests.js        |   89 +-
 .../www/autotest/tests/media.tests.js              |  293 +-
 .../www/autotest/tests/platform.tests.js           |   37 +
 .../www/autotest/tests/storage.tests.js            |   25 -
 tests/MobileSpecUnitTests/www/battery/index.html   |   96 +
 tests/MobileSpecUnitTests/www/camera/index.html    |   96 +
 tests/MobileSpecUnitTests/www/compass/index.html   |  128 +
 tests/MobileSpecUnitTests/www/contacts/index.html  |  112 +
 tests/MobileSpecUnitTests/www/events/index.html    |   72 +
 tests/MobileSpecUnitTests/www/index.html           |   89 +-
 tests/MobileSpecUnitTests/www/location/index.html  |  123 +
 tests/MobileSpecUnitTests/www/main.js              |  140 +
 tests/MobileSpecUnitTests/www/master.css           |   20 +-
 tests/MobileSpecUnitTests/www/misc/index.html      |   59 +
 tests/MobileSpecUnitTests/www/misc/page2.html      |   25 +
 .../www/notification/index.html                    |   81 +
 tests/MobileSpecUnitTests/www/phonegap.js          |   13 +
 tests/MobileSpecUnitTests/www/sql/index.html       |  132 +
 tests/MobileSpecUnitTests/www/storage/index.html   |   50 +
 55 files changed, 4894 insertions(+), 1957 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/5bca3c1a/framework/Cordova/Commands/Camera.cs
----------------------------------------------------------------------
diff --git a/framework/Cordova/Commands/Camera.cs b/framework/Cordova/Commands/Camera.cs
index 6570644..e82b72a 100644
--- a/framework/Cordova/Commands/Camera.cs
+++ b/framework/Cordova/Commands/Camera.cs
@@ -152,7 +152,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
         /// </summary>
         CameraOptions cameraOptions;
 
-        public void getPicture(string options)
+        public void takePicture(string options)
         {
             try
             {

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/5bca3c1a/framework/Cordova/Commands/File.cs
----------------------------------------------------------------------
diff --git a/framework/Cordova/Commands/File.cs b/framework/Cordova/Commands/File.cs
index fa9c5d9..5c36e8e 100644
--- a/framework/Cordova/Commands/File.cs
+++ b/framework/Cordova/Commands/File.cs
@@ -19,6 +19,7 @@ using System.IO.IsolatedStorage;
 using System.Runtime.Serialization;
 using System.Security;
 using System.Text;
+using System.Diagnostics;
 
 namespace WP7CordovaClassLib.Cordova.Commands
 {
@@ -407,11 +408,11 @@ namespace WP7CordovaClassLib.Cordova.Commands
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (IsolatedStorageException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_READABLE_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_READABLE_ERR));//new ErrorCode(NOT_READABLE_ERR)));
             }
         }
 
@@ -468,15 +469,15 @@ namespace WP7CordovaClassLib.Cordova.Commands
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (IsolatedStorageException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_READABLE_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_READABLE_ERR));//new ErrorCode(NOT_READABLE_ERR)));
             }
             catch (Exception)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
             }
 
         }
@@ -501,7 +502,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
                 {
                     if (!isoFile.FileExists(fileOptions.FilePath))
                     {
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                         return;
                     }
                     string mimeType = MimeTypeMapper.GetMimeType(fileOptions.FilePath);
@@ -517,11 +518,11 @@ namespace WP7CordovaClassLib.Cordova.Commands
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (Exception)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_READABLE_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_READABLE_ERR));//new ErrorCode(NOT_READABLE_ERR)));
             }
         }
 
@@ -545,7 +546,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
                 {
                     if (!isoFile.FileExists(fileOptions.FilePath))
                     {
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                         return;
                     }
                     Encoding encoding = Encoding.GetEncoding(fileOptions.Encoding);
@@ -560,15 +561,15 @@ namespace WP7CordovaClassLib.Cordova.Commands
             }
             catch (ArgumentException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(ENCODING_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, ENCODING_ERR));//new ErrorCode(ENCODING_ERR)));
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (Exception)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_READABLE_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_READABLE_ERR));//new ErrorCode(NOT_READABLE_ERR)));
             }
         }
 
@@ -593,7 +594,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
                 {
                     if (!isoFile.FileExists(fileOptions.FilePath))
                     {
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                         return;
                     }
 
@@ -612,15 +613,15 @@ namespace WP7CordovaClassLib.Cordova.Commands
             }
             catch (ArgumentException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(ENCODING_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, ENCODING_ERR));//new ErrorCode(ENCODING_ERR)));
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (Exception)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_READABLE_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_READABLE_ERR));//new ErrorCode(NOT_READABLE_ERR)));
             }
         }
         
@@ -671,19 +672,19 @@ namespace WP7CordovaClassLib.Cordova.Commands
             }
             catch (ArgumentException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(ENCODING_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, ENCODING_ERR));//new ErrorCode(ENCODING_ERR)));
             }
             catch (IsolatedStorageException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(INVALID_MODIFICATION_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, INVALID_MODIFICATION_ERR));//new ErrorCode(INVALID_MODIFICATION_ERR)));
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (Exception)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_READABLE_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_READABLE_ERR));//new ErrorCode(NOT_READABLE_ERR)));
             }
         }
         
@@ -710,29 +711,29 @@ namespace WP7CordovaClassLib.Cordova.Commands
                     if (isoFile.FileExists(fileOptions.FullPath))
                     {
                         DispatchCommandResult(new PluginResult(PluginResult.Status.OK, 
-                            new ModificationMetadata() {modificationTime = isoFile.GetLastWriteTime(fileOptions.FullPath).DateTime.ToString()},
-                            "window.localFileSystem._castDate"));
+                            new ModificationMetadata() {modificationTime = isoFile.GetLastWriteTime(fileOptions.FullPath).DateTime.ToString()}));//,
+//                            "window.localFileSystem._castDate"));
                     }
                     else if (isoFile.DirectoryExists(fileOptions.FullPath))
                     {
                         DispatchCommandResult(new PluginResult(PluginResult.Status.OK,
-                        new ModificationMetadata() { modificationTime = isoFile.GetLastWriteTime(fileOptions.FullPath).DateTime.ToString() },
-                        "window.localFileSystem._castDate"));
+                        new ModificationMetadata() { modificationTime = isoFile.GetLastWriteTime(fileOptions.FullPath).DateTime.ToString() }));//,
+                       // "window.localFileSystem._castDate"));
                     }
                     else
                     {
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                     }
 
                 }
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (IsolatedStorageException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_READABLE_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_READABLE_ERR));//new ErrorCode(NOT_READABLE_ERR)));
             }
         }
 
@@ -756,19 +757,19 @@ namespace WP7CordovaClassLib.Cordova.Commands
                     return;
                 }
                 FileMetadata metaData = new FileMetadata(fileOptions.FullPath);
-                DispatchCommandResult(new PluginResult(PluginResult.Status.OK, metaData, "window.localFileSystem._castDate"));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.OK, metaData));//, "window.localFileSystem._castDate"));
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (IsolatedStorageException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_READABLE_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_READABLE_ERR));//new ErrorCode(NOT_READABLE_ERR)));
             }
             catch (FileNotFoundException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
             }
         }
 
@@ -794,7 +795,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
 
                 if (string.IsNullOrEmpty(fileOptions.FullPath))
                 {
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                     return;
                 }
 
@@ -806,22 +807,22 @@ namespace WP7CordovaClassLib.Cordova.Commands
                     {
                         string path = this.GetParentDirectory(fileOptions.FullPath);
                         entry = FileEntry.GetEntry(path);
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.OK, entry, "window.localFileSystem._castEntry"));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.OK, entry));//, "window.localFileSystem._castEntry"));
                     }
                     else
                     {
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                     }
 
                 }
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR,SECURITY_ERR));// new ErrorCode(SECURITY_ERR)));
             }
             catch (IsolatedStorageException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_READABLE_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_READABLE_ERR));//new ErrorCode(NOT_READABLE_ERR)));
             }
         }
 
@@ -853,7 +854,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
                         }
                         else
                         {
-                            DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                            DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                             return;
                         }
                     }
@@ -862,15 +863,15 @@ namespace WP7CordovaClassLib.Cordova.Commands
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (IsolatedStorageException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(INVALID_MODIFICATION_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, INVALID_MODIFICATION_ERR));//new ErrorCode(INVALID_MODIFICATION_ERR)));
             }
             catch (Exception)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NO_MODIFICATION_ALLOWED_ERR));//new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
             }
         }
 
@@ -887,7 +888,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
             }
             if (string.IsNullOrEmpty(fileOptions.FullPath))
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                 return;
             }
             removeDirRecursively(fileOptions.FullPath);
@@ -910,7 +911,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
 
                 if (string.IsNullOrEmpty(fileOptions.FullPath))
                 {
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                     return;
                 }
 
@@ -930,21 +931,21 @@ namespace WP7CordovaClassLib.Cordova.Commands
                         {
                             entries.Add(FileEntry.GetEntry(path + dir + "/"));
                         }
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.OK, entries, "window.localFileSystem._castEntries"));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.OK, entries));//, "window.localFileSystem._castEntries"));
                     }
                     else
                     {
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                     }
                 }
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (Exception)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NO_MODIFICATION_ALLOWED_ERR));//new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
             }
         }
 
@@ -954,6 +955,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
             {
                 try
                 {
+                    Debug.WriteLine("File options -> " + options);
                     fileOptions = JSON.JsonHelper.Deserialize<FileOptions>(options);
                 }
                 catch (Exception)
@@ -969,7 +971,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
                         long availableSize = isoFile.AvailableFreeSpace;
                         if (fileOptions.Size > availableSize)
                         {
-                            DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(QUOTA_EXCEEDED_ERR)));
+                            DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR,QUOTA_EXCEEDED_ERR));// new ErrorCode(QUOTA_EXCEEDED_ERR)));
                             return;
                         }
                     }
@@ -977,7 +979,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
 
                 if (fileOptions.FileSystemType == PERSISTENT)
                 {
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.OK, new FileSystemInfo("persistent", FileEntry.GetEntry("/")), "window.localFileSystem._castFS"));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.OK, new FileSystemInfo("persistent", FileEntry.GetEntry("/"))));//, "window.localFileSystem._castFS"));
                 }
                 else if (fileOptions.FileSystemType == TEMPORARY)
                 {
@@ -992,33 +994,33 @@ namespace WP7CordovaClassLib.Cordova.Commands
 
                     string tmpFolder = "/" + TMP_DIRECTORY_NAME + "/";
 
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.OK, new FileSystemInfo("temporary", FileEntry.GetEntry(tmpFolder)), "window.localFileSystem._castFS"));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.OK, new FileSystemInfo("temporary", FileEntry.GetEntry(tmpFolder))));//, "window.localFileSystem._castFS"));
                 }
                 else if (fileOptions.FileSystemType == RESOURCE)
                 {
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.OK, new FileSystemInfo("resource"), "window.localFileSystem._castFS"));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.OK, new FileSystemInfo("resource")));//, "window.localFileSystem._castFS"));
                 }
                 else if (fileOptions.FileSystemType == APPLICATION)
                 {
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.OK, new FileSystemInfo("application"), "window.localFileSystem._castFS"));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.OK, new FileSystemInfo("application")));//, "window.localFileSystem._castFS"));
                 }
                 else
                 {
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NO_MODIFICATION_ALLOWED_ERR));//new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
                 }
 
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (FileNotFoundException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
             }
             catch (Exception)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NO_MODIFICATION_ALLOWED_ERR));//new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
             }
         }
 
@@ -1031,15 +1033,17 @@ namespace WP7CordovaClassLib.Cordova.Commands
                 {
                     fileOptions = JSON.JsonHelper.Deserialize<FileOptions>(options);
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
+                    Debug.WriteLine("Failed to deserialize :: " + options);
+                    Debug.WriteLine("Exception :: " + ex.Message);
                     DispatchCommandResult(new PluginResult(PluginResult.Status.JSON_EXCEPTION));
                     return;
                 }
 
                 if (!Uri.IsWellFormedUriString(fileOptions.Uri, UriKind.RelativeOrAbsolute))
                 {
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(ENCODING_ERR)));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, ENCODING_ERR));// new ErrorCode(ENCODING_ERR)));
                     return;
                 }
 
@@ -1048,20 +1052,20 @@ namespace WP7CordovaClassLib.Cordova.Commands
                 FileEntry uriEntry = FileEntry.GetEntry(path);
                 if (uriEntry != null)
                 {
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.OK, uriEntry, "window.localFileSystem._castEntry"));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.OK, uriEntry));//, "window.localFileSystem._castEntry"));
                 }
                 else
                 {
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                 }
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (Exception)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NO_MODIFICATION_ALLOWED_ERR));//new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
             }
         }
 
@@ -1136,17 +1140,17 @@ namespace WP7CordovaClassLib.Cordova.Commands
                     }
                     else
                     {
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                     }
                 }
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (Exception)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NO_MODIFICATION_ALLOWED_ERR));//new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
             }
         }
 
@@ -1166,7 +1170,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
 
                 if ((fileOptions.Parent == null) || (string.IsNullOrEmpty(fileOptions.Parent.FullPath)) || (string.IsNullOrEmpty(fileOptions.FullPath)))
                 {
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                     return;
                 }
 
@@ -1181,7 +1185,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
 
                     if (((!isFileExist) && (!isDirectoryExist)) || (!isParentExist))
                     {
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                         return;
                     }
                     string newName;
@@ -1237,34 +1241,34 @@ namespace WP7CordovaClassLib.Cordova.Commands
                     FileEntry entry = FileEntry.GetEntry(newPath);
                     if (entry != null)
                     {
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.OK, entry, "window.localFileSystem._castEntry"));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.OK, entry));//, "window.localFileSystem._castEntry"));
                     }
                     else
                     {
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                     }
                 }
 
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (FileNotFoundException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
             }
             catch (ArgumentException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(ENCODING_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, ENCODING_ERR));//new ErrorCode(ENCODING_ERR)));
             }
             catch (IsolatedStorageException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(INVALID_MODIFICATION_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, INVALID_MODIFICATION_ERR));//new ErrorCode(INVALID_MODIFICATION_ERR)));
             }
             catch (Exception)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NO_MODIFICATION_ALLOWED_ERR));//new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
             }
         }
 
@@ -1311,7 +1315,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
 
                 if ((string.IsNullOrEmpty(fileOptions.Path)) || (string.IsNullOrEmpty(fileOptions.FullPath)))
                 {
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                     return;
                 }
 
@@ -1323,7 +1327,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
                 }
                 catch (Exception)
                 {
-                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(ENCODING_ERR)));
+                    DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, ENCODING_ERR));//new ErrorCode(ENCODING_ERR)));
                     return;
                 }
 
@@ -1337,7 +1341,7 @@ namespace WP7CordovaClassLib.Cordova.Commands
                     {
                         if (exclusive && (isoFile.FileExists(path) || isoFile.DirectoryExists(path)))
                         {
-                            DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(PATH_EXISTS_ERR)));
+                            DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, PATH_EXISTS_ERR));//new ErrorCode(PATH_EXISTS_ERR)));
                             return;
                         }
 
@@ -1360,41 +1364,41 @@ namespace WP7CordovaClassLib.Cordova.Commands
                     {
                         if ((!isFile) && (!isDirectory))
                         {
-                            DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                            DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                             return;
                         }
                         if (((getDirectory) && (!isDirectory)) || ((!getDirectory) && (!isFile)))
                         {
-                            DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(TYPE_MISMATCH_ERR)));
+                            DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, TYPE_MISMATCH_ERR));//new ErrorCode(TYPE_MISMATCH_ERR)));
                             return;
                         }
                     }
                     FileEntry entry = FileEntry.GetEntry(path);
                     if (entry != null)
                     {
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.OK, entry, "window.localFileSystem._castEntry"));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.OK, entry));//, "window.localFileSystem._castEntry"));
                     }
                     else
                     {
-                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                        DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
                     }
                 }
             }
             catch (SecurityException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(SECURITY_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, SECURITY_ERR));//new ErrorCode(SECURITY_ERR)));
             }
             catch (FileNotFoundException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NOT_FOUND_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NOT_FOUND_ERR));//new ErrorCode(NOT_FOUND_ERR)));
             }
             catch (DirectoryNotFoundException)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(PATH_EXISTS_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, PATH_EXISTS_ERR));//new ErrorCode(PATH_EXISTS_ERR)));
             }
             catch (Exception)
             {
-                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
+                DispatchCommandResult(new PluginResult(PluginResult.Status.ERROR, NO_MODIFICATION_ALLOWED_ERR));//new ErrorCode(NO_MODIFICATION_ALLOWED_ERR)));
             }
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/5bca3c1a/framework/CordovaView.xaml.cs
----------------------------------------------------------------------
diff --git a/framework/CordovaView.xaml.cs b/framework/CordovaView.xaml.cs
index 2a75063..0ca9bd2 100644
--- a/framework/CordovaView.xaml.cs
+++ b/framework/CordovaView.xaml.cs
@@ -358,6 +358,8 @@ namespace WP7CordovaClassLib
         {
             string commandStr = e.Value;
 
+            Debug.WriteLine("ScriptNotify::" + commandStr);
+
             // DOMStorage/Local OR DOMStorage/Session
             if (commandStr.IndexOf("DOMStorage") == 0)
             {
@@ -389,7 +391,7 @@ namespace WP7CordovaClassLib
             }
             else
             {
-                Debug.WriteLine("ProcessCommand :: " + commandStr);
+                //Debug.WriteLine("ProcessCommand :: " + commandStr);
                 this.nativeExecution.ProcessCommand(commandCallParams);
             }
         }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/5bca3c1a/framework/js/cordova-1.6.0-core.js
----------------------------------------------------------------------
diff --git a/framework/js/cordova-1.6.0-core.js b/framework/js/cordova-1.6.0-core.js
index 4a35ba8..9c2dd53 100644
--- a/framework/js/cordova-1.6.0-core.js
+++ b/framework/js/cordova-1.6.0-core.js
@@ -45,6 +45,8 @@ var Cordova = {
 	resources:{}
 };
 
+cordova = Cordova;
+
 Cordova.callbackStatus = {
     NO_RESULT: 0,
     OK: 1,
@@ -2178,13 +2180,14 @@ Cordova.addResource("network");
  * This class contains information about the current network Connection.
  * @constructor
  */
-var Connection = function() 
+var NetworkConnection = function() 
 {
     this.type = null;
     this._firstRun = true;
     this._timer = null;
     this.timeout = 500;
 
+/*
     var me = this;
     this.getInfo(
         function(type) {
@@ -2213,23 +2216,24 @@ var Connection = function()
             if (me._firstRun) 
 			{
                 me._firstRun = false;
-				//console.log("onCordovaConnectionReady");
+				console.log("onCordovaConnectionReady");
                 Cordova.onCordovaConnectionReady.fire();
             }            
         },
         function(e) {
             console.log("Error initializing Network Connection: " + e);
         });
+*/
 };
 
-Connection.UNKNOWN = "unknown";
-Connection.ETHERNET = "ethernet";
-Connection.WIFI = "wifi";
-Connection.CELL_2G = "2g";
-Connection.CELL_3G = "3g";
-Connection.CELL_4G = "4g";
-Connection.NONE = "none";
-Connection.CELL = "cellular";
+NetworkConnection.UNKNOWN = "unknown";
+NetworkConnection.ETHERNET = "ethernet";
+NetworkConnection.WIFI = "wifi";
+NetworkConnection.CELL_2G = "2g";
+NetworkConnection.CELL_3G = "3g";
+NetworkConnection.CELL_4G = "4g";
+NetworkConnection.NONE = "none";
+NetworkConnection.CELL = "cellular";
 
 /**
  * Get connection info
@@ -2237,9 +2241,9 @@ Connection.CELL = "cellular";
  * @param {Function} successCallback The function to call when the Connection data is available
  * @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL)
  */
-Connection.prototype.getInfo = function(successCallback, errorCallback) {
+NetworkConnection.prototype.getInfo = function(successCallback, errorCallback) {
     // Get info
-    Cordova.exec(successCallback, errorCallback, "Connection", "getConnectionInfo", []);
+    Cordova.exec(successCallback, errorCallback, "NetworkConnection", "getConnectionInfo", []);
 };
 
 
@@ -2247,7 +2251,7 @@ Cordova.onCordovaInit.subscribeOnce(function() {
 
 	navigator.network = navigator.network || {};
     if (typeof navigator.network.connection === "undefined") {
-        navigator.network.connection = new Connection();
+        navigator.network.connection = new NetworkConnection();
     }
 });
 }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/5bca3c1a/framework/js/cordova-1.6.0.js
----------------------------------------------------------------------
diff --git a/framework/js/cordova-1.6.0.js b/framework/js/cordova-1.6.0.js
index 6abcf25..e0063cd 100644
--- a/framework/js/cordova-1.6.0.js
+++ b/framework/js/cordova-1.6.0.js
@@ -45,6 +45,8 @@ var Cordova = {
 	resources:{}
 };
 
+cordova = Cordova;
+
 Cordova.callbackStatus = {
     NO_RESULT: 0,
     OK: 1,
@@ -3445,13 +3447,14 @@ Cordova.addResource("network");
  * This class contains information about the current network Connection.
  * @constructor
  */
-var Connection = function() 
+var NetworkConnection = function() 
 {
     this.type = null;
     this._firstRun = true;
     this._timer = null;
     this.timeout = 500;
 
+/*
     var me = this;
     this.getInfo(
         function(type) {
@@ -3480,23 +3483,24 @@ var Connection = function()
             if (me._firstRun) 
 			{
                 me._firstRun = false;
-				//console.log("onCordovaConnectionReady");
+				console.log("onCordovaConnectionReady");
                 Cordova.onCordovaConnectionReady.fire();
             }            
         },
         function(e) {
             console.log("Error initializing Network Connection: " + e);
         });
+*/
 };
 
-Connection.UNKNOWN = "unknown";
-Connection.ETHERNET = "ethernet";
-Connection.WIFI = "wifi";
-Connection.CELL_2G = "2g";
-Connection.CELL_3G = "3g";
-Connection.CELL_4G = "4g";
-Connection.NONE = "none";
-Connection.CELL = "cellular";
+NetworkConnection.UNKNOWN = "unknown";
+NetworkConnection.ETHERNET = "ethernet";
+NetworkConnection.WIFI = "wifi";
+NetworkConnection.CELL_2G = "2g";
+NetworkConnection.CELL_3G = "3g";
+NetworkConnection.CELL_4G = "4g";
+NetworkConnection.NONE = "none";
+NetworkConnection.CELL = "cellular";
 
 /**
  * Get connection info
@@ -3504,9 +3508,9 @@ Connection.CELL = "cellular";
  * @param {Function} successCallback The function to call when the Connection data is available
  * @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL)
  */
-Connection.prototype.getInfo = function(successCallback, errorCallback) {
+NetworkConnection.prototype.getInfo = function(successCallback, errorCallback) {
     // Get info
-    Cordova.exec(successCallback, errorCallback, "Connection", "getConnectionInfo", []);
+    Cordova.exec(successCallback, errorCallback, "NetworkConnection", "getConnectionInfo", []);
 };
 
 
@@ -3514,7 +3518,7 @@ Cordova.onCordovaInit.subscribeOnce(function() {
 
 	navigator.network = navigator.network || {};
     if (typeof navigator.network.connection === "undefined") {
-        navigator.network.connection = new Connection();
+        navigator.network.connection = new NetworkConnection();
     }
 });
 }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/5bca3c1a/framework/js/cordova.js.base
----------------------------------------------------------------------
diff --git a/framework/js/cordova.js.base b/framework/js/cordova.js.base
index 6a39183..70002f9 100644
--- a/framework/js/cordova.js.base
+++ b/framework/js/cordova.js.base
@@ -39,6 +39,8 @@ var Cordova = {
 	resources:{}
 };
 
+cordova = Cordova;
+
 Cordova.callbackStatus = {
     NO_RESULT: 0,
     OK: 1,

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/5bca3c1a/framework/js/network.js
----------------------------------------------------------------------
diff --git a/framework/js/network.js b/framework/js/network.js
index 9c84be7..de13393 100644
--- a/framework/js/network.js
+++ b/framework/js/network.js
@@ -19,7 +19,7 @@ Cordova.addResource("network");
  * This class contains information about the current network Connection.
  * @constructor
  */
-var Connection = function() 
+var NetworkConnection = function() 
 {
     this.type = null;
     this._firstRun = true;
@@ -65,14 +65,14 @@ var Connection = function()
 */
 };
 
-Connection.UNKNOWN = "unknown";
-Connection.ETHERNET = "ethernet";
-Connection.WIFI = "wifi";
-Connection.CELL_2G = "2g";
-Connection.CELL_3G = "3g";
-Connection.CELL_4G = "4g";
-Connection.NONE = "none";
-Connection.CELL = "cellular";
+NetworkConnection.UNKNOWN = "unknown";
+NetworkConnection.ETHERNET = "ethernet";
+NetworkConnection.WIFI = "wifi";
+NetworkConnection.CELL_2G = "2g";
+NetworkConnection.CELL_3G = "3g";
+NetworkConnection.CELL_4G = "4g";
+NetworkConnection.NONE = "none";
+NetworkConnection.CELL = "cellular";
 
 /**
  * Get connection info
@@ -80,9 +80,9 @@ Connection.CELL = "cellular";
  * @param {Function} successCallback The function to call when the Connection data is available
  * @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL)
  */
-Connection.prototype.getInfo = function(successCallback, errorCallback) {
+NetworkConnection.prototype.getInfo = function(successCallback, errorCallback) {
     // Get info
-    Cordova.exec(successCallback, errorCallback, "Connection", "getConnectionInfo", []);
+    Cordova.exec(successCallback, errorCallback, "NetworkConnection", "getConnectionInfo", []);
 };
 
 
@@ -90,7 +90,7 @@ Cordova.onCordovaInit.subscribeOnce(function() {
 
 	navigator.network = navigator.network || {};
     if (typeof navigator.network.connection === "undefined") {
-        navigator.network.connection = new Connection();
+        navigator.network.connection = new NetworkConnection();
     }
 });
 }

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/5bca3c1a/tests/MobileSpecUnitTests/CordovaSourceDictionary.xml
----------------------------------------------------------------------
diff --git a/tests/MobileSpecUnitTests/CordovaSourceDictionary.xml b/tests/MobileSpecUnitTests/CordovaSourceDictionary.xml
index ecd4aa8..dea2523 100644
--- a/tests/MobileSpecUnitTests/CordovaSourceDictionary.xml
+++ b/tests/MobileSpecUnitTests/CordovaSourceDictionary.xml
@@ -1,27 +1,193 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This file is auto-generated, do not edit! -jm -->
 <CordovaSourceDictionary>
-    <FilePath Value="www\cordova-1.6.0.js"/>
-    <FilePath Value="www\cordova.wp7.js"/>
     <FilePath Value="www\index.html"/>
+    <FilePath Value="www\main.js"/>
     <FilePath Value="www\master.css"/>
+    <FilePath Value="www\phonegap.js"/>
+    <FilePath Value="www\.git\COMMIT_EDITMSG"/>
+    <FilePath Value="www\.git\config"/>
+    <FilePath Value="www\.git\description"/>
+    <FilePath Value="www\.git\FETCH_HEAD"/>
+    <FilePath Value="www\.git\HEAD"/>
+    <FilePath Value="www\.git\index"/>
+    <FilePath Value="www\.git\ORIG_HEAD"/>
+    <FilePath Value="www\.git\hooks\applypatch-msg.sample"/>
+    <FilePath Value="www\.git\hooks\commit-msg.sample"/>
+    <FilePath Value="www\.git\hooks\post-commit.sample"/>
+    <FilePath Value="www\.git\hooks\post-receive.sample"/>
+    <FilePath Value="www\.git\hooks\post-update.sample"/>
+    <FilePath Value="www\.git\hooks\pre-applypatch.sample"/>
+    <FilePath Value="www\.git\hooks\pre-commit.sample"/>
+    <FilePath Value="www\.git\hooks\pre-rebase.sample"/>
+    <FilePath Value="www\.git\hooks\prepare-commit-msg.sample"/>
+    <FilePath Value="www\.git\hooks\update.sample"/>
+    <FilePath Value="www\.git\info\exclude"/>
+    <FilePath Value="www\.git\logs\HEAD"/>
+    <FilePath Value="www\.git\logs\refs\heads\FixMarkup"/>
+    <FilePath Value="www\.git\logs\refs\heads\master"/>
+    <FilePath Value="www\.git\logs\refs\remotes\origin\FixMarkup"/>
+    <FilePath Value="www\.git\logs\refs\remotes\origin\master"/>
+    <FilePath Value="www\.git\objects\00\852a9c29baf5964d09123a5a9102bd2e785b76"/>
+    <FilePath Value="www\.git\objects\01\427660cf1b9181f02404c0c483329ba96cc44a"/>
+    <FilePath Value="www\.git\objects\02\3678d3fbcea50f936615ceba123371b02f539c"/>
+    <FilePath Value="www\.git\objects\03\81010419221e8f300301171555d0f00b11b496"/>
+    <FilePath Value="www\.git\objects\06\465ed81993a02e57f6f50d5e76d6ddd786cbc7"/>
+    <FilePath Value="www\.git\objects\0b\05192470bad6d7833f6fce441fbd9dd14e2b0e"/>
+    <FilePath Value="www\.git\objects\0d\a640788bbb8c2daa4d2579d086ebabd7c74026"/>
+    <FilePath Value="www\.git\objects\15\dc462a492bd2d885a5c66a9ebedb428f3f0653"/>
+    <FilePath Value="www\.git\objects\16\23a5e6bd4b4644e8818d1cb186b4dbe373365f"/>
+    <FilePath Value="www\.git\objects\18\a9ceb6f5058acd9bd67f1ce15f261b5876dc0c"/>
+    <FilePath Value="www\.git\objects\19\b1ee68c1c215bc6b94492bf58d22da33af9897"/>
+    <FilePath Value="www\.git\objects\1d\43c998df62997fe5d4805ee8c98e4c6a2b3b14"/>
+    <FilePath Value="www\.git\objects\1f\0864799f0111dcf9c3c1ff62be745eebf230ab"/>
+    <FilePath Value="www\.git\objects\1f\871a02650c8ebc5113ff58c551f86fa8d69f7d"/>
+    <FilePath Value="www\.git\objects\23\70fa5d32a5e317fffd51e07d3fa87d4b974a65"/>
+    <FilePath Value="www\.git\objects\25\824ddbc83aaffecb9ba1c13656f61254223f35"/>
+    <FilePath Value="www\.git\objects\27\8c11eeda787a3307957168451db245a72d5ab6"/>
+    <FilePath Value="www\.git\objects\2c\a11d82b9e7705be62d571099cdb7a7f0915d48"/>
+    <FilePath Value="www\.git\objects\2d\427f363ba5d107b04bfcb5ead9ea2a8b3c1ac3"/>
+    <FilePath Value="www\.git\objects\2e\0b3bb2c032cb9d0de52ca26681c2d4298fff79"/>
+    <FilePath Value="www\.git\objects\2e\27da5193f218c91e4d759fe9351114c7528749"/>
+    <FilePath Value="www\.git\objects\2f\034c14c690ffe8893e224c4a22118256c2da20"/>
+    <FilePath Value="www\.git\objects\2f\24e2eda40fbbb393580dfab4451e7f1424da22"/>
+    <FilePath Value="www\.git\objects\31\bd3564cb01d5ff75ca5db681ed6a8f79a09fe1"/>
+    <FilePath Value="www\.git\objects\35\a71bf2db555a614a5e7ebf95c5f9b2e596e4c5"/>
+    <FilePath Value="www\.git\objects\3b\1a1888ac6fa02cf932c7125e7a14cc1ceb5c97"/>
+    <FilePath Value="www\.git\objects\3b\c4d9b6492bab080fcf4c3bfe84184f5b56b13f"/>
+    <FilePath Value="www\.git\objects\3d\c8dcb62cba6319cd97e62eb14ab9c597b3f9d4"/>
+    <FilePath Value="www\.git\objects\43\4bdbcf5ec5ec3695451ac3a15f6cf6fefb68ed"/>
+    <FilePath Value="www\.git\objects\43\8bfbb9b52f07a736e21775035e9c0093996e2f"/>
+    <FilePath Value="www\.git\objects\43\a5c8682349c77449b906d1e8aa519e69eea832"/>
+    <FilePath Value="www\.git\objects\46\d767597eaaf315f4b836f3af8ef72b813b67ac"/>
+    <FilePath Value="www\.git\objects\46\fe95b82054465635a2f3c8127117b2553350be"/>
+    <FilePath Value="www\.git\objects\48\efa273f7bf6f7e46254a122976a7978076b438"/>
+    <FilePath Value="www\.git\objects\4b\69561b9f3624eafe256d886f17fa513d60bd28"/>
+    <FilePath Value="www\.git\objects\4d\132001b18caa2a390ea8e513e2b3e388e1e2a4"/>
+    <FilePath Value="www\.git\objects\4e\9ac4bcb597e16d8d3e65d55848f93a0a15f715"/>
+    <FilePath Value="www\.git\objects\50\1d246a4359a620c754e0acbb043e736743ef06"/>
+    <FilePath Value="www\.git\objects\52\196fede4dc878a3bad8dd833aaeb569665c26d"/>
+    <FilePath Value="www\.git\objects\58\50c507389f59496c98863b628ba074ab02939a"/>
+    <FilePath Value="www\.git\objects\59\3104ae5d7e83ec3deab8c55f663c8559e85994"/>
+    <FilePath Value="www\.git\objects\59\ce3aa754ed566aaa81f1209632ec8eaac15e5e"/>
+    <FilePath Value="www\.git\objects\5c\77260101ff78454693d80824208ae06897d620"/>
+    <FilePath Value="www\.git\objects\5c\f27b0a61f6628954f46683db6e61c0ad6da468"/>
+    <FilePath Value="www\.git\objects\5e\ab91e0fec1d630539170ed63eb4219c9f00fa5"/>
+    <FilePath Value="www\.git\objects\5f\3c5e78ceb00423f355c5a0bfdf5a7f1c6f23fc"/>
+    <FilePath Value="www\.git\objects\5f\7ff8a7dd51a3e4ad1af1351b1e411e24406f11"/>
+    <FilePath Value="www\.git\objects\64\81ec9621e87030ea1f51d5d928e350786bf6e0"/>
+    <FilePath Value="www\.git\objects\66\4f8d7f56a248ce5ff43682a0bdbc299bfa2187"/>
+    <FilePath Value="www\.git\objects\67\fb28cf312dcca56a5de52623b6a61a9d5fcec5"/>
+    <FilePath Value="www\.git\objects\6a\9c5a7a4627f2539eb2ab5f0f03af7c1b779721"/>
+    <FilePath Value="www\.git\objects\6b\045ab17d563b388528c59c4907be66bdd8d2d9"/>
+    <FilePath Value="www\.git\objects\6b\e26e963b7ea0cde0bb4993277d62e9b7161113"/>
+    <FilePath Value="www\.git\objects\6b\f737ecb14b1489442ef685fd1f876e4d68a5c8"/>
+    <FilePath Value="www\.git\objects\6b\fdf962a53627ef073d29dff6e393b8ef347c27"/>
+    <FilePath Value="www\.git\objects\6c\e3ae61c79562241f5ec3c21bd2e4ed129bcbb9"/>
+    <FilePath Value="www\.git\objects\70\033705eee5defaa4ecab9d9bb64c7bdde36211"/>
+    <FilePath Value="www\.git\objects\78\90b40fd557069be2af61da302374479bb8729a"/>
+    <FilePath Value="www\.git\objects\79\a84e59383501f1cccb025e64e35e31d284aac4"/>
+    <FilePath Value="www\.git\objects\7b\482fb014de3283331bd1ee5bc36677ac9dc9a3"/>
+    <FilePath Value="www\.git\objects\7c\a69f34333437e41817a47fcea494e7691f23c6"/>
+    <FilePath Value="www\.git\objects\80\47722211c36b2f7ae82ae02d2b6c5894e3e24a"/>
+    <FilePath Value="www\.git\objects\81\894cff4f5492f92893c00ff159afb63064599d"/>
+    <FilePath Value="www\.git\objects\83\1f508e20bdfc23c309f7c38097e2797b0445a3"/>
+    <FilePath Value="www\.git\objects\86\547f23dbf617fb59e3e0f107a510071380bfcb"/>
+    <FilePath Value="www\.git\objects\89\632b8ac5ba0d09d1328ea482690fa026f1ea2a"/>
+    <FilePath Value="www\.git\objects\8a\8545c407f16cad77a25c9a3d5fd0749260b09c"/>
+    <FilePath Value="www\.git\objects\8b\0f6d2d8b46a2a16a001b3aa36b451f30edefca"/>
+    <FilePath Value="www\.git\objects\90\5aea8a563feb8ce3eb2c5cbab33b2657d75983"/>
+    <FilePath Value="www\.git\objects\96\59b4801630d40e7f43d9d727a4feef752e96db"/>
+    <FilePath Value="www\.git\objects\9b\2e6199fbcc63b3ddcd61d67176f8d20c8ce0ed"/>
+    <FilePath Value="www\.git\objects\9b\9deb43bc103574dc5a616f9ff0d6de1eeb34d5"/>
+    <FilePath Value="www\.git\objects\9c\858bbb3fb96c21c98d9933e7ff6fbd380d01fa"/>
+    <FilePath Value="www\.git\objects\9f\bf9a2df1b15d002ab906dfe83c41d6acc795df"/>
+    <FilePath Value="www\.git\objects\a4\77b057691d9822344f71f5ee8a0ffa6a0d08f2"/>
+    <FilePath Value="www\.git\objects\a6\4f5671e923c2a8f62933223a91149913066d0c"/>
+    <FilePath Value="www\.git\objects\aa\55885ff9773a88b7a40c432db96c1f8e514945"/>
+    <FilePath Value="www\.git\objects\aa\bef1bd13e823c949a0118d294d52ed06fe643f"/>
+    <FilePath Value="www\.git\objects\ac\8be10b1f453e00502fab35a3d99d2547168313"/>
+    <FilePath Value="www\.git\objects\af\0ae42cd2d24f98e40a1894907dbe9a7c312350"/>
+    <FilePath Value="www\.git\objects\b0\7cfe3bb2fc4ebbdaf4d202bbea8e855b38a56f"/>
+    <FilePath Value="www\.git\objects\b3\2ba86619f7f55084fa4a04cd6ed5817fe9290f"/>
+    <FilePath Value="www\.git\objects\b5\f9ae4686b8bafdb37de7ef53eef178140a6cdc"/>
+    <FilePath Value="www\.git\objects\ba\2f8e067487e0f0791588c6f22799cf9eae17f9"/>
+    <FilePath Value="www\.git\objects\bb\d86424f313d94e41b1f4930e8d7b251eb4896b"/>
+    <FilePath Value="www\.git\objects\bc\74cbee6dad9b92fc576b436931ce42ea46c3a9"/>
+    <FilePath Value="www\.git\objects\bf\49d843c515bfe36e6930b12e230806d0a068dd"/>
+    <FilePath Value="www\.git\objects\c6\46db1f8925cd4e23913e794d6332987665b0cf"/>
+    <FilePath Value="www\.git\objects\c9\987ccc4572ac6b33033b0688a0cb58978e4885"/>
+    <FilePath Value="www\.git\objects\ca\e19ce4bffa249621ea9607b2a1bef7835cdc7a"/>
+    <FilePath Value="www\.git\objects\cf\6ded415b1a9c0e701a667f5ff33cb938c50a47"/>
+    <FilePath Value="www\.git\objects\d1\43a94b3f477405bc181d22b02148e48199607d"/>
+    <FilePath Value="www\.git\objects\d3\e057bf677f7625fecf1004b14f9656b2151082"/>
+    <FilePath Value="www\.git\objects\d4\862dd8b9c056d6a8830767a41a1cbce0f5ffdb"/>
+    <FilePath Value="www\.git\objects\d6\38a296555728c4d6f4ed5516ce371f547e3442"/>
+    <FilePath Value="www\.git\objects\d8\d7446466dd5d69f5a46904b7e80d883fbe5684"/>
+    <FilePath Value="www\.git\objects\df\5fa3f2dd25748c0b3bd92a0e4774fa10a6db5d"/>
+    <FilePath Value="www\.git\objects\e8\2b5d93262cfab4d06c0c4273c4e0b396167d52"/>
+    <FilePath Value="www\.git\objects\e8\3fb5de51b4ea2e82091bbf8bdb84674ec4d99b"/>
+    <FilePath Value="www\.git\objects\eb\00a7c6440fe048444aac46d3c79812c1d2e543"/>
+    <FilePath Value="www\.git\objects\ee\6c398d211176966d54eb06e812476cd9ccb737"/>
+    <FilePath Value="www\.git\objects\f3\859c7b685bb0a2c3c5dfa4586984ca29d8bdc5"/>
+    <FilePath Value="www\.git\objects\fa\5dd659184571d6faad903ae83fb47edebea3a3"/>
+    <FilePath Value="www\.git\objects\fb\c268403b93ef911943ed5936f2dbb95b41bf36"/>
+    <FilePath Value="www\.git\objects\fd\61aa447ae20b082fc1b59f8bd3d48e95a433b7"/>
+    <FilePath Value="www\.git\objects\fe\1a11928b429a55dadedf8663db02ae6e74b481"/>
+    <FilePath Value="www\.git\objects\ff\1f290b4128015331a85461474ccf2faa25e2c9"/>
+    <FilePath Value="www\.git\objects\pack\pack-4fc82e1b469e633c178779442509b196fdfc06c0.idx"/>
+    <FilePath Value="www\.git\objects\pack\pack-4fc82e1b469e633c178779442509b196fdfc06c0.pack"/>
+    <FilePath Value="www\.git\refs\heads\FixMarkup"/>
+    <FilePath Value="www\.git\refs\heads\master"/>
+    <FilePath Value="www\.git\refs\remotes\origin\FixMarkup"/>
+    <FilePath Value="www\.git\refs\remotes\origin\master"/>
+    <FilePath Value="www\accelerometer\index.html"/>
+    <FilePath Value="www\audio\index.html"/>
     <FilePath Value="www\autotest\index.html"/>
     <FilePath Value="www\autotest\qunit.css"/>
     <FilePath Value="www\autotest\qunit.js"/>
     <FilePath Value="www\autotest\test-runner.js"/>
+    <FilePath Value="www\autotest\pages\accelerometer.html"/>
+    <FilePath Value="www\autotest\pages\all.html"/>
+    <FilePath Value="www\autotest\pages\battery.html"/>
+    <FilePath Value="www\autotest\pages\camera.html"/>
+    <FilePath Value="www\autotest\pages\capture.html"/>
+    <FilePath Value="www\autotest\pages\compass.html"/>
+    <FilePath Value="www\autotest\pages\contacts.html"/>
+    <FilePath Value="www\autotest\pages\device.html"/>
+    <FilePath Value="www\autotest\pages\file.html"/>
+    <FilePath Value="www\autotest\pages\geolocation.html"/>
+    <FilePath Value="www\autotest\pages\media.html"/>
+    <FilePath Value="www\autotest\pages\network.html"/>
+    <FilePath Value="www\autotest\pages\notification.html"/>
+    <FilePath Value="www\autotest\pages\platform.html"/>
+    <FilePath Value="www\autotest\pages\storage.html"/>
     <FilePath Value="www\autotest\tests\accelerometer.tests.js"/>
+    <FilePath Value="www\autotest\tests\battery.tests.js"/>
     <FilePath Value="www\autotest\tests\camera.tests.js"/>
     <FilePath Value="www\autotest\tests\capture.tests.js"/>
     <FilePath Value="www\autotest\tests\compass.tests.js"/>
     <FilePath Value="www\autotest\tests\contacts.tests.js"/>
     <FilePath Value="www\autotest\tests\device.tests.js"/>
     <FilePath Value="www\autotest\tests\file.tests.js"/>
-    <FilePath Value="www\autotest\tests\filetransfer.tests.js"/>
     <FilePath Value="www\autotest\tests\geolocation.tests.js"/>
     <FilePath Value="www\autotest\tests\media.tests.js"/>
     <FilePath Value="www\autotest\tests\network.tests.js"/>
     <FilePath Value="www\autotest\tests\notification.tests.js"/>
     <FilePath Value="www\autotest\tests\orientation.tests.js"/>
+    <FilePath Value="www\autotest\tests\platform.tests.js"/>
     <FilePath Value="www\autotest\tests\storage.tests.js"/>
     <FilePath Value="www\autotest\tests\system.tests.js"/>
+    <FilePath Value="www\battery\index.html"/>
+    <FilePath Value="www\camera\index.html"/>
+    <FilePath Value="www\compass\index.html"/>
+    <FilePath Value="www\contacts\index.html"/>
+    <FilePath Value="www\events\index.html"/>
+    <FilePath Value="www\location\index.html"/>
+    <FilePath Value="www\misc\index.html"/>
+    <FilePath Value="www\misc\page2.html"/>
+    <FilePath Value="www\notification\index.html"/>
+    <FilePath Value="www\sql\index.html"/>
+    <FilePath Value="www\storage\index.html"/>
+    <FilePath Value="www\cordova.wp7.js"/>
 </CordovaSourceDictionary>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/5bca3c1a/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj
----------------------------------------------------------------------
diff --git a/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj b/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj
index 7312cc7..f730fac 100644
--- a/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj
+++ b/tests/MobileSpecUnitTests/MobileSpecUnitTests.csproj
@@ -82,6 +82,9 @@
     <None Include="Properties\WMAppManifest.xml" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="..\..\..\cordova-js\pkg\cordova.wp7.js">
+      <Link>www\cordova.wp7.js</Link>
+    </Content>
     <Content Include="ApplicationIcon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -89,34 +92,60 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="CordovaSourceDictionary.xml" />
-    <None Include="ManifestProcessor.js" />
-    <Content Include="SplashScreenImage.jpg" />
-    <Content Include="www\autotest\index.html">
-      <SubType>Designer</SubType>
-    </Content>
+    <Content Include="www\accelerometer\index.html" />
+    <Content Include="www\audio\index.html" />
+    <Content Include="www\autotest\index.html" />
+    <Content Include="www\autotest\pages\accelerometer.html" />
+    <Content Include="www\autotest\pages\all.html" />
+    <Content Include="www\autotest\pages\battery.html" />
+    <Content Include="www\autotest\pages\camera.html" />
+    <Content Include="www\autotest\pages\capture.html" />
+    <Content Include="www\autotest\pages\compass.html" />
+    <Content Include="www\autotest\pages\contacts.html" />
+    <Content Include="www\autotest\pages\device.html" />
+    <Content Include="www\autotest\pages\file.html" />
+    <Content Include="www\autotest\pages\geolocation.html" />
+    <Content Include="www\autotest\pages\media.html" />
+    <Content Include="www\autotest\pages\network.html" />
+    <Content Include="www\autotest\pages\notification.html" />
+    <Content Include="www\autotest\pages\platform.html" />
+    <Content Include="www\autotest\pages\storage.html" />
     <Content Include="www\autotest\qunit.css" />
     <Content Include="www\autotest\qunit.js" />
     <Content Include="www\autotest\test-runner.js" />
     <Content Include="www\autotest\tests\accelerometer.tests.js" />
+    <Content Include="www\autotest\tests\battery.tests.js" />
     <Content Include="www\autotest\tests\camera.tests.js" />
     <Content Include="www\autotest\tests\capture.tests.js" />
     <Content Include="www\autotest\tests\compass.tests.js" />
     <Content Include="www\autotest\tests\contacts.tests.js" />
     <Content Include="www\autotest\tests\device.tests.js" />
     <Content Include="www\autotest\tests\file.tests.js" />
-    <Content Include="www\autotest\tests\filetransfer.tests.js" />
     <Content Include="www\autotest\tests\geolocation.tests.js" />
     <Content Include="www\autotest\tests\media.tests.js" />
     <Content Include="www\autotest\tests\network.tests.js" />
     <Content Include="www\autotest\tests\notification.tests.js" />
     <Content Include="www\autotest\tests\orientation.tests.js" />
+    <Content Include="www\autotest\tests\platform.tests.js" />
     <Content Include="www\autotest\tests\storage.tests.js" />
     <Content Include="www\autotest\tests\system.tests.js" />
-    <Content Include="www\cordova-1.6.0.js" />
-    <Content Include="www\index.html">
-      <SubType>Designer</SubType>
-    </Content>
+    <Content Include="www\battery\index.html" />
+    <Content Include="www\camera\index.html" />
+    <Content Include="www\compass\index.html" />
+    <Content Include="www\contacts\index.html" />
+    <Content Include="www\events\index.html" />
+    <Content Include="www\index.html" />
+    <Content Include="www\location\index.html" />
+    <Content Include="www\main.js" />
     <Content Include="www\master.css" />
+    <Content Include="www\misc\index.html" />
+    <Content Include="www\misc\page2.html" />
+    <Content Include="www\notification\index.html" />
+    <Content Include="www\phonegap.js" />
+    <Content Include="www\sql\index.html" />
+    <Content Include="www\storage\index.html" />
+    <None Include="ManifestProcessor.js" />
+    <Content Include="SplashScreenImage.jpg" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/5bca3c1a/tests/MobileSpecUnitTests/www/accelerometer/index.html
----------------------------------------------------------------------
diff --git a/tests/MobileSpecUnitTests/www/accelerometer/index.html b/tests/MobileSpecUnitTests/www/accelerometer/index.html
new file mode 100644
index 0000000..b5f9ae4
--- /dev/null
+++ b/tests/MobileSpecUnitTests/www/accelerometer/index.html
@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width,height=device-height,user-scalable=no,initial-scale=1.0" />
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
+    <title>Cordova Mobile Spec</title>
+    <link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
+    <script type="text/javascript" charset="utf-8" src="../phonegap.js"></script>      
+
+      
+<script type="text/javascript" charset="utf-8">
+
+    var deviceReady = false;
+
+    function roundNumber(num) {
+        var dec = 3;
+        var result = Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);
+        return result;
+    }
+
+    //-------------------------------------------------------------------------
+    // Acceleration
+    //-------------------------------------------------------------------------
+    var watchAccelId = null;
+    
+    /**
+     * Start watching acceleration
+     */
+    var watchAccel = function() {
+        console.log("watchAccel()");
+
+        // Success callback
+        var success = function(a){
+            document.getElementById('x').innerHTML = roundNumber(a.x);
+            document.getElementById('y').innerHTML = roundNumber(a.y);
+            document.getElementById('z').innerHTML = roundNumber(a.z);
+            console.log("watchAccel success callback");
+        };
+
+        // Fail callback
+        var fail = function(e){
+            console.log("watchAccel fail callback with error code "+e);
+            stopAccel();
+            setAccelStatus(Accelerometer.ERROR_MSG[e]);
+        };
+
+        // Update acceleration every 1 sec
+        var opt = {};
+        opt.frequency = 1000;
+        watchAccelId = navigator.accelerometer.watchAcceleration(success, fail, opt);
+
+        setAccelStatus("Running");
+    };
+
+    /**
+     * Stop watching the acceleration
+     */
+    var stopAccel = function() {
+    	console.log("stopAccel()");
+        setAccelStatus("Stopped");
+        if (watchAccelId) {
+            navigator.accelerometer.clearWatch(watchAccelId);
+            watchAccelId = null;
+        }
+    };
+
+    /**
+     * Get current acceleration
+     */
+    var getAccel = function() {
+        console.log("getAccel()");
+
+        // Stop accel if running
+        stopAccel();
+
+        // Success callback
+        var success = function(a){
+            document.getElementById('x').innerHTML = roundNumber(a.x);
+            document.getElementById('y').innerHTML = roundNumber(a.y);
+            document.getElementById('z').innerHTML = roundNumber(a.z);
+        };
+
+        // Fail callback
+        var fail = function(e){
+            console.log("getAccel fail callback with error code "+e);
+            setAccelStatus(Accelerometer.ERROR_MSG[e]);
+        };
+
+        // Make call
+        var opt = {};
+        navigator.accelerometer.getCurrentAcceleration(success, fail, opt);
+    };
+
+    /**
+     * Set accelerometer status
+     */
+    var setAccelStatus = function(status) {
+        document.getElementById('accel_status').innerHTML = status;
+    };
+    
+    /**
+     * Function called when page has finished loading.
+     */
+    function init() {
+        console.log("accelerometer.init()");
+        document.addEventListener("deviceready", function() {
+                deviceReady = true;
+                console.log("Device="+device.platform+" "+device.version);
+            }, false);
+        window.setTimeout(function() {
+        	if (!deviceReady) {
+        		alert("Error: PhoneGap did not initialize.  Demo will not run correctly.");
+        	}
+        },1000);
+    }
+
+</script>
+
+  </head>
+  <body onload="init();" id="stage" class="theme">
+  
+    <h1>Acceleration</h1>
+    <div id="info">
+        <div id="accel_status">Stopped</div>
+        <div ><table width="100%">
+            <tr><td width="20%">X:</td><td id="x"> </td></tr>
+            <tr><td width="20%">Y:</td><td id="y"> </td></tr>
+            <tr><td width="20%">Z:</td><td id="z"> </td></tr>
+        </table></div>
+    </div>
+
+    <h2>Action</h2>
+    <div class="btn large" onclick="getAccel();">Get Acceleration</div>
+    <div class="btn large" onclick="watchAccel();">Start Watch</div>
+    <div class="btn large" onclick="stopAccel();">Clear Watch</div>
+    <h2> </h2><div class="backBtn" onclick="backHome();">Back</div>
+  </body>
+</html>      

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/5bca3c1a/tests/MobileSpecUnitTests/www/audio/index.html
----------------------------------------------------------------------
diff --git a/tests/MobileSpecUnitTests/www/audio/index.html b/tests/MobileSpecUnitTests/www/audio/index.html
new file mode 100644
index 0000000..ba2f8e0
--- /dev/null
+++ b/tests/MobileSpecUnitTests/www/audio/index.html
@@ -0,0 +1,291 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width,height=device-height,user-scalable=no,initial-scale=1.0" />
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"> <!-- ISO-8859-1 -->
+    <title>Cordova Audio Tests</title>
+    <link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
+    <script type="text/javascript" charset="utf-8" src="../phonegap.js"></script>      
+
+      
+<script type="text/javascript" charset="utf-8">
+
+    var deviceReady = false;
+
+    //-------------------------------------------------------------------------
+    // Audio player
+    //-------------------------------------------------------------------------
+    var media1 = null;
+    var media1Timer = null;
+    var audioSrc = null;
+    var recordSrc = "myRecording.mp3";
+
+    /**
+     * Play audio
+     */
+    function playAudio(url) {
+        console.log("playAudio()");
+        console.log(" -- media="+media1);
+
+        //var src = "http://neuga.s3.amazonaws.com/onclassical/strings-organ.mp3";
+        var src = "http://audio.ibeat.org/content/p1rj1s/p1rj1s_-_rockGuitar.mp3";
+        //var src = "/android_asset/www/Jet_Sledding.mp4"; // no work
+        //var src = "http://vprbbc.streamguys.net/vprbbc24.mp3"; // mp3 streaming
+        
+        if (url) {
+            src = url;
+        }
+
+        // Stop playing if src is different from currently playing source
+        if (src != audioSrc) {
+            if (media1 != null) {
+                stopAudio();
+                media1 = null;
+            }
+        }
+
+        if (media1 == null) {
+
+
+            // TEST STREAMING AUDIO PLAYBACK
+            //var src = "http://nunzioweb.com/misc/Bon_Jovi-Crush_Mystery_Train.mp3";   // works
+            //var src = "http://nunzioweb.com/misc/Bon_Jovi-Crush_Mystery_Train.m3u"; // doesn't work
+            //var src = "http://www.wav-sounds.com/cartoon/bugsbunny1.wav"; // works
+            //var src = "http://www.angelfire.com/fl5/html-tutorial/a/couldyou.mid"; // doesn't work
+            //var src = "MusicSearch/mp3/train.mp3";    // works
+            //var src = "bryce.mp3";  // works
+            //var src = "/android_asset/www/bryce.mp3"; // works
+
+            media1 = new Media(src,
+                function() {
+                    console.log("playAudio():Audio Success");
+                },
+                function(err) {
+                    console.log("playAudio():Audio Error: "+err.code);
+                    setAudioStatus("Error: " + err.code);
+                },
+                function(status) {
+                    console.log("playAudio():Audio Status: "+status);
+                    setAudioStatus(Media.MEDIA_MSG[status]);
+
+                    // If stopped, then stop getting current position
+                    if (Media.MEDIA_STOPPED == status) {
+                        clearInterval(media1Timer);
+                        media1Timer = null;
+                        setAudioPosition("0 sec");
+                    }
+                });
+        }
+        audioSrc = src;
+        document.getElementById('audio_duration').innerHTML = "";
+        // Play audio
+        media1.play();
+        if (media1Timer == null && media1.getCurrentPosition) {
+            media1Timer = setInterval(
+                function() {
+                    media1.getCurrentPosition(
+                        function(position) {
+                            console.log("Pos="+position);
+                            if (position >= 0.0) {
+                                setAudioPosition(position+" sec");
+                            }
+                        },
+                        function(e) {
+                            console.log("Error getting pos="+e);
+                            setAudioPosition("Error: "+e);
+                        }
+                    );
+                },
+                1000
+            );
+        }
+
+        // Get duration
+        var counter = 0;
+        var timerDur = setInterval(
+            function() {
+                counter = counter + 100;
+                if (counter > 2000) {
+                    clearInterval(timerDur);
+                }
+                var dur = media1.getDuration();
+                if (dur > 0) {
+                    clearInterval(timerDur);
+                    document.getElementById('audio_duration').innerHTML = dur + " sec";
+                }
+            }, 100);
+    }
+
+    /**
+     * Pause audio playback
+     */
+    function pauseAudio() {
+        console.log("pauseAudio()");
+        if (media1) {
+            media1.pause();
+        }
+    }
+
+    /**
+     * Stop audio
+     */
+    function stopAudio() {
+        console.log("stopAudio()");
+        if (media1) {
+            media1.stop();
+            media1.release();
+        }
+        clearInterval(media1Timer);
+        media1Timer = null;
+    }
+
+    /**
+     * Set audio status
+     */
+    var setAudioStatus = function(status) {
+        document.getElementById('audio_status').innerHTML = status;
+    };
+
+    /**
+     * Set audio position
+     */
+    var setAudioPosition = function(position) {
+        document.getElementById('audio_position').innerHTML = position;
+    };
+
+    //-------------------------------------------------------------------------
+    // Audio recorder
+    //-------------------------------------------------------------------------
+    var mediaRec = null;
+    var recTime = 0;
+
+    /**
+     * Record audio
+     */
+    function recordAudio() {
+        console.log("recordAudio()");
+        console.log(" -- media="+mediaRec);
+        if (mediaRec == null) {
+
+            var src = recordSrc;
+            mediaRec = new Media(src,
+                    function() {
+                        console.log("recordAudio():Audio Success");
+                    },
+                    function(err) {
+                        console.log("recordAudio():Audio Error: "+err.code);
+                        setAudioStatus("Error: " + err.code);
+                    },
+                    function(status) {
+                        console.log("recordAudio():Audio Status: "+status);
+                        setAudioStatus(Media.MEDIA_MSG[status]);
+                    }
+                );
+        }
+
+        navigator.notification.beep(1);
+
+        // Record audio
+        mediaRec.startRecord();
+
+        // Stop recording after 10 sec
+        recTime = 0;
+        var recInterval = setInterval(function() {
+            recTime = recTime + 1;
+            setAudioPosition(recTime+" sec");
+            if (recTime >= 10) {
+                clearInterval(recInterval);
+                if (mediaRec.stopAudioRecord){
+                    mediaRec.stopAudioRecord();
+                } else {
+                    mediaRec.stopRecord();
+                }
+                console.log("recordAudio(): stop");
+                navigator.notification.beep(1);
+            }
+        }, 1000);
+    }
+
+    /**
+     * Play back recorded audio
+     */
+    function playRecording() {
+        playAudio(recordSrc);
+    }
+    
+    /**
+     * Function to create a file for iOS recording
+     */
+    function getRecordSrc() {
+        var fsFail = function(error) {
+            console.log("error creating file for iOS recording");
+        };
+        var gotFile = function(file) {
+            recordSrc = file.fullPath;
+            //console.log("recording Src: " + recordSrc);
+        };
+        var gotFS = function(fileSystem) {
+            fileSystem.root.getFile("iOSRecording.wav", {create: true}, gotFile, fsFail);
+        };
+        window.requestFileSystem(LocalFileSystem.TEMPORARY, 0, gotFS, fsFail);
+    }
+    
+    /**
+     * Function called when page has finished loading.
+     */
+    function init() {
+        document.addEventListener("deviceready", function() {
+                deviceReady = true;
+                if (device.platform.indexOf("iPhone") !=-1 || device.platform.indexOf("iPad") !=-1)
+                {
+                     getRecordSrc();
+                }
+                console.log("Device="+device.platform+" "+device.version);
+            }, false);
+        window.setTimeout(function() {
+        	if (!deviceReady) {
+        		alert("Error: PhoneGap did not initialize.  Demo will not run correctly.");
+        	}
+        },1000);
+    }
+
+</script>
+
+  </head>
+  <body onload="init();" id="stage" class="theme">
+  
+    <h1>Audio</h1>  
+    <div id="info">
+        <table width="100%">
+        <tr><td><b>Status:</b></td><td id="audio_status"> </td></tr>
+        <tr><td><b>Duration:</b></td><td id="audio_duration"></td></tr>
+        <tr><td><b>Position:</b></td><td id="audio_position"></td></tr>
+        </table>
+    </div>
+    <h2>Action</h2>
+    <table>
+        <tr>
+            <th colspan=3>Play Sample Audio</th>
+        </tr>
+        <tr>
+            <td><div class="btn large" style="width:100%;" onclick="playAudio();">Play</div></td>
+            <td><div class="btn large" style="width:100%;" onclick="pauseAudio();">Pause</div></td>
+            <td><div class="btn large" style="width:100%;" onclick="stopAudio();">Stop</div></td>
+        </tr>
+        <tr>
+            <th colspan=3><br><br>Record Audio</th>
+        </tr>
+        <tr>
+            <td colspan=3><div class="btn large" onclick="recordAudio();">Record Audio for 10 sec</a></td>
+        </tr>
+        <tr>
+            <td><div class="btn large" style="width:100%;" onclick="playRecording();">Play</div></td>
+            <td><div class="btn large" style="width:100%;" onclick="pauseAudio();">Pause</div></td>
+            <td><div class="btn large" style="width:100%;" onclick="stopAudio();">Stop</div></td>
+        </tr>
+    </table>
+    
+    <h2> </h2><div class="backBtn" onclick="backHome();">Back</div>
+    
+  </body>
+</html>      

http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/5bca3c1a/tests/MobileSpecUnitTests/www/autotest/index.html
----------------------------------------------------------------------
diff --git a/tests/MobileSpecUnitTests/www/autotest/index.html b/tests/MobileSpecUnitTests/www/autotest/index.html
index 542fe5b..5f6401a 100644
--- a/tests/MobileSpecUnitTests/www/autotest/index.html
+++ b/tests/MobileSpecUnitTests/www/autotest/index.html
@@ -1,83 +1,33 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
     <meta name="viewport" content="width=device-width, height=device-height, user-scalable=yes, initial-scale=1.0;" />
 
-    <title>Cordova API Spec</title>
-
-    <!-- Load QUnit -->
-    <link rel="stylesheet" type="text/css" href="qunit.css" />
-          
-	<script type="text/javascript">
-			
-			function onBodyLoad()
-			{
-				document.addEventListener("backbutton",onBackButton,false);	
-			}
-			
-			function onBackButton()
-			{
-        
-				window.history.go(-1);
-			}
-			
-	</script>
-    
-    <script type="text/javascript" src="qunit.js"></script>
-
-    
-    <!-- Source -->
-    <script type="text/javascript" src="../cordova-1.6.0.js"></script>
-    
-    <!-- Load Test Runner -->
-    <script type="text/javascript" src="test-runner.js"></script>
-
-   
-    
-    <!-- Individual Tests -->
-
-    
-
-    <script type="text/javascript" src="tests/capture.tests.js"></script>  
-
-
-    <script type="text/javascript" src="tests/device.tests.js"></script>
-    <script type="text/javascript" src="tests/accelerometer.tests.js"></script>
-    <script type="text/javascript" src="tests/camera.tests.js"></script>
-    
-
-    <script type="text/javascript" src="tests/notification.tests.js"></script>
-    <script type="text/javascript" src="tests/network.tests.js"></script>
-    <script type="text/javascript" src="tests/geolocation.tests.js"></script>
-
-    <script type="text/javascript" src="tests/compass.tests.js"></script>
-
-
-
-    <script type="text/javascript" src="tests/contacts.tests.js"></script>
-    <script type="text/javascript" src="tests/file.tests.js"></script>
-    <script type="text/javascript" src="tests/filetransfer.tests.js"></script>
-    <script type="text/javascript" src="tests/media.tests.js"></script>
-
-
-    <script type="text/javascript" src="tests/storage.tests.js"></script>
-
-
-    <script type="text/javascript" src="tests/orientation.tests.js"></script>
-    
-    
-    
-    
+    <title>Cordova API Specs</title>
 
+    <link rel="stylesheet" href="../master.css" type="text/css" media="screen" title="no title" charset="utf-8">
+    <script type="text/javascript" src="../phonegap.js"></script>
   </head>
-    <body onload="onBodyLoad()">
-        <h1 id="qunit-header">PhoneGap API Spec</h1>
-        <h2 id="qunit-banner"></h2>
-        <h2 id="qunit-userAgent"></h2>
-        <ol id="qunit-tests"></ol>
-        <div id="qunit-fixture">
-            <!-- Populated by tests -->
-        </div>
-    </body>
+  <body id="stage" class="theme">
+    <h1>Cordova API Specs</h1>
+
+    <a href="pages/all.html" class="btn large" style="width:100%;">Run All Tests</a>
+    <a href="pages/accelerometer.html" class="btn large" style="width:100%;">Run Accelerometer Tests</a>
+    <a href="pages/battery.html" class="btn large" style="width:100%;">Run Battery Tests</a>
+    <a href="pages/camera.html" class="btn large" style="width:100%;">Run Camera Tests</a>
+    <a href="pages/capture.html" class="btn large" style="width:100%;">Run Capture Tests</a>
+    <a href="pages/compass.html" class="btn large" style="width:100%;">Run Compass Tests</a>
+    <a href="pages/contacts.html" class="btn large" style="width:100%;">Run Contacts Tests</a>
+    <a href="pages/device.html" class="btn large" style="width:100%;">Run Device Tests</a>
+    <a href="pages/file.html" class="btn large" style="width:100%;">Run File Tests</a>
+    <a href="pages/geolocation.html" class="btn large" style="width:100%;">Run Geolocation Tests</a>
+    <a href="pages/media.html" class="btn large" style="width:100%;">Run Media Tests</a>
+    <a href="pages/network.html" class="btn large" style="width:100%;">Run Network Tests</a>
+    <a href="pages/notification.html" class="btn large" style="width:100%;">Run Notification Tests</a>
+    <a href="pages/platform.html" class="btn large" style="width:100%;">Run Platform Tests</a>
+    <a href="pages/storage.html" class="btn large" style="width:100%;">Run Storage Tests</a>
+
+    <h2> </h2><div class="backBtn" onclick="backHome();">Back</div>
+  </body>
 </html>


Mime
View raw message