Fixed TTS-1910 by updating system directory path in Security

Signed-off-by: Li, Hao <haox.li@intel.com>

diff --git a/tests/Security/index.html b/tests/Security/index.html
index b32d50befce519a5aad7ee497c2214a4abdc82c9..b552940736de8f7d5a0e7628748416c2f45c9c88 100755 (executable)
--- a/tests/Security/index.html
+++ b/tests/Security/index.html
@@ -59,8 +59,15 @@ Authors:
             </ul>
             <ul data-role="listview">
                 <li data-role="list-divider">Shared System Directory</li>
+                <!--
                 <li><div data-role="button" id="openSystemBtn">Open Directory</div></li>
                 <li><div data-role="button" id="systemBtn">Create File</div></li>
+                -->
+                <li><div data-role="button" id="openUsrShareBtn">Open Usr Share Directory</div></li>
+                <li><div data-role="button" id="openOptShareBtn">Open Opt Share Directory</div></li>
+                <li><div data-role="button" id="openOptDbspaceBtn">Open Opt Dbspace Directory</div></li>
+                <li><div data-role="button" id="openOptUsrDbspaceBtn">Open Opt Usr Dbspace Directory</div></li>
+                <li><div data-role="button" id="openOptVarKdbDbBtn">Open Opt Var Kdb Db Directory</div></li>
                 <ul data-role="listview" id="system" data-inset="true"></ul>
             </ul>
             <ul data-role="listview" >

diff --git a/tests/Security/js/main.js b/tests/Security/js/main.js
index 82d75789927e06fbfce9cadc9ffd8bd4a3ea89e6..058c2645a5566ea231f5f2c65f14506c1db769b9 100755 (executable)
--- a/tests/Security/js/main.js
+++ b/tests/Security/js/main.js
@@ -30,7 +30,16 @@ Authors:
 */
 
 var gFiles = [];
-var count = 0, homeDir, mediaDir, systemDir, etcDir;
+var home_dir = "/opt/home/app",
+    shared_media_dir = "/opt/usr/media",
+    shared_system_dir_1 = "/usr/share",
+    shared_system_dir_2 = "/opt/share",
+    shared_system_dir_3 = "/opt/dbspace",
+    shared_system_dir_4 = "/opt/usr/dbspace",
+    shared_system_dir_5 = "/opt/var/kdb/db",
+    etc_dir = "/etc";
+var count = 0, homeDir, mediaDir, systemDir, etcDir,
+            usrShareDir, optShareDir, optDbshareDir, optUsrDbspaceDir, optVarKdbDbDir;
 var etcFlag = false;
 
 $(document).ready(function(){
@@ -67,22 +76,48 @@ $(document).ready(function(){
                 dir.listFiles(function(files) {
                     makeFileList(files, selector);
                     switch (str) {
-                        case "/home/": {
+                        case home_dir: {
                             homeDir = dir;
                             alert("Open Success");
                             break;
                         }
-                        case "/opt/media/": {
+                        case shared_media_dir: {
                             mediaDir = dir;
                             alert("Open Success");
                             break;
                         }
-                        case "/usr/share/": {
-                            systemDir = dir;
+                        //case "/usr/share": {
+                        //    systemDir = dir;
+                        //    alert("Open Success");
+                        //    break;
+                        //}
+                        /* Shared System Directory */
+                        case shared_system_dir_1: {
+                            usrShareDir = dir;
                             alert("Open Success");
                             break;
                         }
-                        case "/etc/": {
+                        case shared_system_dir_2: {
+                            optShareDir = dir;
+                            alert("Open Success");
+                            break;
+                        }
+                        case shared_system_dir_3: {
+                            optDbshareDir = dir;
+                            alert("Open Success");
+                            break;
+                        }
+                        case shared_system_dir_4: {
+                            optUsrDbspaceDir = dir;
+                            alert("Open Success");
+                            break;
+                        }
+                        case shared_system_dir_5: {
+                            optVarKdbDbDir = dir;
+                            alert("Open Success");
+                            break;
+                        }
+                        case etc_dir: {
                             etcDir = dir;
                             alert("Open Success");
                             break;
@@ -91,10 +126,15 @@ $(document).ready(function(){
                     }
                 }, function(err) {
                     switch (str) {
-                        case "/home/":
-                        case "/opt/media/":
-                        case "/usr/share/":
-                        case "/etc/": {
+                        case home_dir:
+                        case shared_media_dir:
+                        //case "/usr/share":
+                        case shared_system_dir_1:
+                        case shared_system_dir_2:
+                        case shared_system_dir_3:
+                        case shared_system_dir_4:
+                        case shared_system_dir_5:
+                        case etc_dir: {
                             alert("Open Fail: " + err.message);
                             break;
                         }
@@ -143,35 +183,75 @@ $(document).ready(function(){
         createFile(mediaDir, "#media");
         checkEnable();
     });
-    $("#systemBtn").on("click",function() {
-        createFile(systemDir, "#system");
-        checkEnable();
-    });
+    //$("#systemBtn").on("click",function() {
+    //    createFile(systemDir, "#system");
+    //    checkEnable();
+    //});
 
     $("#openHomeBtn").on("click",function() {
         if (!homeDir) {
-            openDirectory("/home/", "#home");
+            openDirectory(home_dir, "#home");
         } else {
             alert("Already Opened");
         }
     });
     $("#openMediaBtn").on("click",function() {
         if (!mediaDir) {
-            openDirectory("/opt/media/", "#media");
+            openDirectory(shared_media_dir, "#media");
         } else {
             alert("Already Opened");
         }
     });
-    $("#openSystemBtn").on("click",function() {
-        if (!systemDir) {
-            openDirectory("/usr/share/", "#system");
+    //$("#openSystemBtn").on("click",function() {
+    //    if (!systemDir) {
+    //        openDirectory("/opt/share", "#system");
+    //    } else {
+    //        alert("Already Opened");
+    //    }
+    //});
+    $("#openUsrShareBtn").on("click",function() {
+        if (!usrShareDir) {
+            openDirectory(shared_system_dir_1, "#system");
+            checkEnable();
+        } else {
+            alert("Already Opened");
+        }
+    });
+    $("#openOptShareBtn").on("click",function() {
+        if (!optShareDir) {
+            openDirectory(shared_system_dir_2, "#system");
+            checkEnable();
+        } else {
+            alert("Already Opened");
+        }
+    });
+    $("#openOptDbspaceBtn").on("click",function() {
+        if (!optDbshareDir) {
+            openDirectory(shared_system_dir_3, "#system");
+            checkEnable();
+        } else {
+            alert("Already Opened");
+        }
+    });
+    $("#openOptUsrDbspaceBtn").on("click",function() {
+        if (!optUsrDbspaceDir) {
+            openDirectory(shared_system_dir_4, "#system");
+            checkEnable();
+        } else {
+            alert("Already Opened");
+        }
+    });
+    $("#openOptVarKdbDbBtn").on("click",function() {
+        if (!optVarKdbDbDir) {
+            openDirectory(shared_system_dir_5, "#system");
+            checkEnable();
         } else {
             alert("Already Opened");
         }
     });
     $("#openEtcBtn").on("click",function() {
         if (!etcDir) {
-            openDirectory("/etc/", "#etc");
+            openDirectory(etc_dir, "#etc");
             etcFlag = true;
             checkEnable();
         }
@@ -188,9 +268,9 @@ function deleteFile(id) {
     var dir, selector;
     try {
         switch (gFiles[Number(id)].path) {
-            case "/home/": dir = homeDir; selector = "#home"; break;
-            case "/opt/media/": dir = mediaDir; selector = "#media"; break;
-            case "/usr/share/": dir = systemDir; selector = "#system"; break;
+            case home_dir: dir = homeDir; selector = "#home"; break;
+            case shared_media_dir: dir = mediaDir; selector = "#media"; break;
+            //case "/usr/share": dir = systemDir; selector = "#system"; break;
             default: break;
         }
         if (dir) {
@@ -207,7 +287,8 @@ function deleteFile(id) {
 }
 
 function checkEnable() {
-    if (homeDir && mediaDir && systemDir && etcFlag) {
+    if (homeDir && mediaDir && etcFlag &&
+        usrShareDir && optShareDir && optDbshareDir && optUsrDbspaceDir && optVarKdbDbDir) {
         EnablePassButton();
     }
 }