fix merge conflict

Author: purplecabbage

tests/plugin.xml

@@ -23,6 +23,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="org.apache.cordova.file.tests"
     version="1.2.1-dev">
+
     <name>Cordova File Plugin Tests</name>
     <license>Apache 2.0</license>
 

tests/tests.js

@@ -998,7 +998,6 @@ exports.defineAutoTests = function () {
                 // create a new directory entry
                 createDirectory(dirName, function (entry) {
                     entry.getParent(function (parent) {
-                        //alert("parent: "+JSON.stringify(parent));
                         expect(parent).toBeDefined();
                         expect(parent.fullPath).toCanonicallyMatch(rootPath);
                         // cleanup
@@ -3049,11 +3048,105 @@ exports.defineAutoTests = function () {
     //File API describe
 
 };
-/*
+//******************************************************************************************
+//***************************************Manual Tests***************************************
+//******************************************************************************************
+
 exports.defineManualTests = function (contentEl, createActionButton) {
-createActionButton('Dump device', function () {
-console.log(JSON.stringify(window.device, null, '\t'));
-});
+
+    function resolveFs(fsname) {
+        var fsURL = "cdvfile://localhost/" + fsname + "/";
+        logMessage("Resolving URL: " + fsURL);
+        resolveLocalFileSystemURL(fsURL, function (entry) {
+            logMessage("Success", 'green');
+            logMessage(entry.toURL(), 'blue');
+            logMessage(entry.toInternalURL(), 'blue');
+            logMessage("Resolving URL: " + entry.toURL());
+            resolveLocalFileSystemURL(entry.toURL(), function (entry2) {
+                logMessage("Success", 'green');
+                logMessage(entry2.toURL(), 'blue');
+                logMessage(entry2.toInternalURL(), 'blue');
+            }, logError("resolveLocalFileSystemURL"));
+        }, logError("resolveLocalFileSystemURL"));
+    }
+
+    function testPrivateURL() {
+        requestFileSystem(TEMPORARY, 0, function (fileSystem) {
+            logMessage("Temporary root is at " + fileSystem.root.toNativeURL());
+            fileSystem.root.getFile("testfile", {
+                create : true
+            }, function (entry) {
+                logMessage("Temporary file is at " + entry.toNativeURL());
+                if (entry.toNativeURL().substring(0, 12) == "file:///var/") {
+                    logMessage("File starts with /var/, trying /private/var");
+                    var newURL = "file://localhost/private/var/" + entry.toNativeURL().substring(12) + "?and=another_thing";
+                    //var newURL = entry.toNativeURL();
+                    logMessage(newURL, 'blue');
+                    resolveLocalFileSystemURL(newURL, function (newEntry) {
+                        logMessage("Successfully resolved.", 'green');
+                        logMessage(newEntry.toURL(), 'blue');
+                        logMessage(newEntry.toNativeURL(), 'blue');
+                    }, logError("resolveLocalFileSystemURL"));
+                }
+            }, logError("getFile"));
+        }, logError("requestFileSystem"));
+    }
+
+    function clearLog() {
+        var log = document.getElementById("info");
+        log.innerHTML = "";
+    }
+
+    function logMessage(message, color) {
+        var log = document.getElementById("info");
+        var logLine = document.createElement('div');
+        if (color) {
+            logLine.style.color = color;
+        }
+        logLine.innerHTML = message;
+        log.appendChild(logLine);
+    }
+
+    function logError(serviceName) {
+        return function (err) {
+            logMessage("ERROR: " + serviceName + " " + JSON.stringify(err), "red");
+        };
+    }
+
+    var fsRoots = {
+        "ios" : "library,library-nosync,documents,documents-nosync,cache,bundle,root,private",
+        "android" : "files,files-external,documents,sdcard,cache,cache-external,root"
+    };
+
+    //Add title and align to content
+    var div = document.createElement('h2');
+    div.appendChild(document.createTextNode('File Systems'));
+    div.setAttribute("align", "center");
+    contentEl.appendChild(div);
+    
+    div = document.createElement('div');
+    div.setAttribute("id", "button");
+    div.setAttribute("align", "center");
+    contentEl.appendChild(div);
+    if (fsRoots.hasOwnProperty(cordova.platformId)) {
+        (fsRoots[cordova.platformId].split(',')).forEach(function (fs) {
+            if (cordova.platformId === 'ios' && fs === 'private') {
+                createActionButton("Test private URL (iOS)", function () {
+                    clearLog();
+                    testPrivateURL();
+                }, 'button');
+            } else {
+                createActionButton(fs, function () {
+                    clearLog();
+                    resolveFs(fs);
+                }, 'button');
+            }
+        });
+    }
+    
+    
+    div = document.createElement('div');
+    div.setAttribute("id", "info");
+    div.setAttribute("align", "center");
+    contentEl.appendChild(div);
 };
-});
-*/