Fix TTS-2131 by removing the home and etc directories' checking

Signed-off-by: YuhanX Xu <yuhanx.xu@intel.com>

diff --git a/tests/Security/index.html b/tests/Security/index.html
index 778c0baa8c5307a2f356062e6114304972e2410c..a52a87a9c72b71e517f9fde7413cb64574f759e8 100755 (executable)
--- a/tests/Security/index.html
+++ b/tests/Security/index.html
@@ -46,21 +46,12 @@ Authors:
             <h1 id="main_page_title"></h1>
         </div>
         <div id="content">
-            <ul data-role="listview">
-                <li data-role="list-divider">Home Directory</li>
-                <li><div data-role="button" id="openHomeBtn">Open /opt/home/app directory</div></li>
-                <li><div data-role="button" id="homeBtn">Create file</div></li>
-                <ul data-role="listview" id="home" data-inset="true"></ul>
-            </ul>
             <ul data-role="listview">
                 <li data-role="list-divider">Shared Media Directory</li>
                 <li><div data-role="button" id="openMediaBtn">Open /opt/usr/media directory</div></li>
-                <li><div data-role="button" id="mediaBtn">Create file</div></li>
-                <ul data-role="listview" id="media" data-inset="true"></ul>
-            </ul>
-            <ul data-role="listview" >
-                <li data-role="list-divider">Permission Denied Directory</li>
-                <li><div data-role="button" id="openEtcBtn">Open /etc/ directory</div></li>
+                <li><div data-role="button" id="createFileBtn">Create file</div></li>
+                <li data-role="list-divider">File List</li>
+                <ul data-role="listview" id="media" data-inset="true" hidden="true"></ul>
             </ul>
         </div>
         <div data-role="footer" data-position="fixed">
@@ -68,17 +59,17 @@ Authors:
         <div data-role="popup" id="popup_info">
           <font class="fontSize">
             <p>Test Purpose: </p>
-            <p>Verifies that (1) this applicaton is running by non-root ID and, (2) it is only allowed to manipulate files in the following locations: home directory, shared media directory.</p>
+            <p>Verifies that (1) this applicaton is running by non-root ID and, (2) it is allowed to read and write files in the shared media directory.</p>
             <p>Test Step: </p>
             <ol>
               <li>Get the "USER" info via cmdline "ps aux|awk 'NR==1;/tctbhtests\.TCTBehaviorTests/'" in console.</li>
-              <li>Open directories for home directory, shared media directory and etc directory.</li>
-              <li>Create and remove files in home directory, shared media directory.</li>
+              <li>Open shared media directory.</li>
+              <li>Create and remove files in shared media directory.</li>
             </ol>
             <p>Expected Result: </p>
             <ul>
               <li>The "USRER" info is NOT root user.</li>
-              <li>There is <strong>no error message</strong> when click buttons under "Home Directory", "Shared Media Directory"; and there <strong>appears error message</strong> when click button under "Permission Denied Directory".</li>
+              <li>There is <strong>no error message</strong> when click buttons under "Shared Media Directory".</li>
               <li>Only new created files can be removed; opened files in step 2 cannot.</li>
             </ul>
           </font>

diff --git a/tests/Security/js/main.js b/tests/Security/js/main.js
index 86962641f8b7511582633c048161b150aa814781..fea67ce188956107b3b5c9ce9d31cd6076b7d4b6 100755 (executable)
--- a/tests/Security/js/main.js
+++ b/tests/Security/js/main.js
@@ -29,17 +29,14 @@ Authors:
 
 */
 
-var HOME_DIR = "file:///opt/home/app",
-    HOME_DELETE_DIR = "/opt/home/app/",
-    SHARED_MEDIA_DIR = "file:///opt/usr/media",
-    MEDIA_DELETE_DIR = "internal0/",
-    ETC_DIR = "file:///etc";
-var count = 0, homeDir, mediaDir, etcDir;
+var SHARED_MEDIA_DIR = "file:///opt/usr/media",
+    MEDIA_ID = "#media";
+var count = 0, mediaDir;
 var gFiles = [], createdId = [];
-var etcFlag = false;
 
 $(document).ready(function(){
     DisablePassButton();
+    $('#createFileBtn').addClass("ui-disabled");
 
     function onError(err) {
         alert("Error: " + err.message);
@@ -65,34 +62,19 @@ $(document).ready(function(){
         if (str) {
             $(selector).append(str).trigger("create").listview("refresh");
         }
+
+        $('#createFileBtn').removeClass("ui-disabled");
+        $('#openMediaBtn').addClass("ui-disabled");
     }
 
     function openDirectory(str, selector) {
         try {
             tizen.filesystem.resolve(str, function(dir) {
                 dir.listFiles(function(files) {
+                    $(MEDIA_ID).show();
                     makeFileList(files, selector);
-                    switch (str) {
-                        /* Home Directory */
-                        case HOME_DIR: {
-                            homeDir = dir;
-                            alert("Open Success");
-                            break;
-                        }
-                        /* Shared Media Directory */
-                        case SHARED_MEDIA_DIR: {
-                            mediaDir = dir;
-                            alert("Open Success");
-                            break;
-                        }
-                        /* Permission Denied Directory */
-                        case ETC_DIR: {
-                            etcDir = dir;
-                            alert("Open Success");
-                            break;
-                        }
-                        default: break;
-                    }
+                    mediaDir = dir;
+                    alert("Open Success");
                 }, function(err) {
                     alert("Open Fail: " + err.message);
                 });
@@ -131,35 +113,14 @@ $(document).ready(function(){
         }
     }
 
-    $("#homeBtn").on("click",function() {
-        createFile(homeDir, "#home");
-        checkEnable();
-    });
-    $("#mediaBtn").on("click",function() {
-        createFile(mediaDir, "#media");
-        checkEnable();
-    });
-
-    $("#openHomeBtn").on("click",function() {
-        if (!homeDir) {
-            openDirectory(HOME_DIR, "#home");
-        } else {
-            alert("Already Opened");
-        }
-    });
     $("#openMediaBtn").on("click",function() {
         if (!mediaDir) {
-            openDirectory(SHARED_MEDIA_DIR, "#media");
-        } else {
-            alert("Already Opened");
+            openDirectory(SHARED_MEDIA_DIR, MEDIA_ID);
         }
     });
-    $("#openEtcBtn").on("click",function() {
-        if (!etcDir) {
-            openDirectory(ETC_DIR, "#etc");
-            etcFlag = true;
-            checkEnable();
-        }
+    $("#createFileBtn").on("click",function() {
+        createFile(mediaDir, MEDIA_ID);
+        EnablePassButton();
     });
 });
 
@@ -176,32 +137,21 @@ function deleteFile(id) {
     }
 
     try {
-        switch (gFiles[Number(id)].path) {
-            case HOME_DELETE_DIR: dir = homeDir; selector = "#home"; break;
-            case MEDIA_DELETE_DIR: dir = mediaDir; selector = "#media"; break;
-            default: break;
-        }
-        if (dir) {
-            dir.deleteFile(gFiles[Number(id)].fullPath, function() {
-                //Delete the id in createdId array.
-                createdId.splice(index, 1);
-                $("#" + gFiles[Number(id)].name).remove();
-                $(selector).trigger("create").listview("refresh");
-            }, function (err) {
-                alert("Error: " + err.message);
-            });
-        }
+        dir = mediaDir;
+        selector = MEDIA_ID;
+        dir.deleteFile(gFiles[Number(id)].fullPath, function() {
+            //Delete the id in createdId array.
+            createdId.splice(index, 1);
+            $("#" + gFiles[Number(id)].name).remove();
+            $(selector).trigger("create").listview("refresh");
+        }, function (err) {
+            alert("Error: " + err.message);
+        });
     } catch (exc) {
         alert("Delete File Error: " + exc.message);
     }
 }
 
-function checkEnable() {
-    if (homeDir && mediaDir && etcFlag) {
-        EnablePassButton();
-    }
-}
-
 function backAppsHome() {
     createdId.forEach(function(id) {
         deleteFile(id);