Fix TTS-2027 to re-implement "Security" by the latest draft of 2.2 spec

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

diff --git a/tests/Security/index.html b/tests/Security/index.html
index 969fc123182275a3bb7bbb12e43857f22e6cea9c..33bc756070e39b057d877a38565733aca03c06cd 100755 (executable)
--- a/tests/Security/index.html
+++ b/tests/Security/index.html
@@ -57,24 +57,6 @@ Authors:
                 <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">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" >
-                <li data-role="list-divider">Temporary Directory</li>
-                <li><div data-role="button" id="openTmpBtn">Open /tmp/ directory</div></li>
-                <ul data-role="listview" id="tmp" 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>
@@ -85,18 +67,18 @@ Authors:
         <div data-role="popup" id="popup_info">
           <font style="font-size:85%">
             <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, shared system resources, and temporary directories.</p>
-           <p>Test Step: </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>Test Step: </p>
             <ol>
               <li>Get the "USER" info via cmdline "ps aux|awk 'NR==1;/tctbhtests\.TCTBehaviorTests/'" in console.</li>
-              <li>Open and/or create files in home directory, shared media directory, shared system resources, temporary directory and etc directory.</li>
+              <li>Open and/or create files in home directory, shared media directory and etc directory.</li>
             </ol>
             <p>Expected Result: </p>
-            <p>Test passes if 
-               <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", "Shared System Directory" and "Temporary Directory"</li>
-               <li>and if there appears error message when click button under "Permission Denied Directory".</li>
-            </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".</li>
+                <li>There appears error message when click button under "Permission Denied Directory".</li>
+              </ul>
           </font>
         </div>
     </body>

diff --git a/tests/Security/js/main.js b/tests/Security/js/main.js
index 50fa1f7070a747e589562cabf0bcac38a87bd1d8..544dddeb3e42479cb43a4c62b1667b2b1f2dab5e 100755 (executable)
--- a/tests/Security/js/main.js
+++ b/tests/Security/js/main.js
@@ -33,19 +33,13 @@ var HOME_DIR = "file:///opt/home/app",
     HOME_DELETE_DIR = "/opt/home/app/",
     SHARED_MEDIA_DIR = "file:///opt/usr/media",
     MEDIA_DELETE_DIR = "internal0/",
-    SHARED_SYSTEM_DIR_1 = "file:///usr/share",
-    SHARED_SYSTEM_DIR_2 = "file:///opt/share",
-    SHARED_SYSTEM_DIR_3 = "file:///opt/dbspace",
-    SHARED_SYSTEM_DIR_4 = "file:///opt/usr/dbspace",
-    SHARED_SYSTEM_DIR_5 = "file:///opt/var/kdb/db",
-    TMP_DIR = "file:///tmp",
     ETC_DIR = "file:///etc";
-var count = 0, homeDir, mediaDir, systemDir, tmpDir, etcDir,
-            usrShareDir, optShareDir, optDbshareDir, optUsrDbspaceDir, optVarKdbDbDir;
+var count = 0, homeDir, mediaDir, etcDir;
 var gFiles = [], createdNumber = [];
 var etcFlag = false;
 
 $(document).ready(function(){
+    DisablePassButton();
 
     function onError(err) {
         alert("Error: " + err.message);
@@ -75,84 +69,34 @@ $(document).ready(function(){
 
     function openDirectory(str, selector) {
         try {
-            if (str == HOME_DIR || str == SHARED_MEDIA_DIR) {
-                tizen.filesystem.resolve(str, function(dir) {
-                    dir.listFiles(function(files) {
-                        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;
-                            }
-                            default: break;
+            tizen.filesystem.resolve(str, function(dir) {
+                dir.listFiles(function(files) {
+                    makeFileList(files, selector);
+                    switch (str) {
+                        /* Home Directory */
+                        case HOME_DIR: {
+                            homeDir = dir;
+                            alert("Open Success");
+                            break;
                         }
-                    }, function(err) {
-                        alert("Open Fail: " + err.message);
-                    });
-                }, onError, "rw");
-            } else {
-                tizen.filesystem.resolve(str, function(dir) {
-                    dir.listFiles(function(files) {
-                        makeFileList(files, selector);
-                        switch (str) {
-                            /* Shared System Directory */
-                            //case "/usr/share": {
-                            //    systemDir = dir;
-                            //    alert("Open Success");
-                            //    break;
-                            //}
-                            case SHARED_SYSTEM_DIR_1: {
-                                usrShareDir = dir;
-                                alert("Open Success");
-                                break;
-                            }
-                            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;
-                            }
-                            /* Temporary Directory */
-                            case TMP_DIR: {
-                                tmpDir = dir;
-                                alert("Open Success");
-                                break;
-                            }
-                            /* Permission Denied Directory */
-                            case ETC_DIR: {
-                                etcDir = dir;
-                                alert("Open Success");
-                                break;
-                            }
-                            default: break;
+                        /* Shared Media Directory */
+                        case SHARED_MEDIA_DIR: {
+                            mediaDir = dir;
+                            alert("Open Success");
+                            break;
                         }
-                    }, function(err) {
-                        alert("Open Fail: " + err.message);
-                    });
-                }, onError, "r");
-            }
+                        /* Permission Denied Directory */
+                        case ETC_DIR: {
+                            etcDir = dir;
+                            alert("Open Success");
+                            break;
+                        }
+                        default: break;
+                    }
+                }, function(err) {
+                    alert("Open Fail: " + err.message);
+                });
+            }, onError, "rw");
         } catch (exc) {
             alert("tizen.filesystem.resolve(" + str + ") exc: " + exc.message);
         }
@@ -195,10 +139,6 @@ $(document).ready(function(){
         createFile(mediaDir, "#media");
         checkEnable();
     });
-    //$("#systemBtn").on("click",function() {
-    //    createFile(systemDir, "#system");
-    //    checkEnable();
-    //});
 
     $("#openHomeBtn").on("click",function() {
         if (!homeDir) {
@@ -214,61 +154,6 @@ $(document).ready(function(){
             alert("Already Opened");
         }
     });
-    //$("#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");
-        }
-    });
-    $("#openTmpBtn").on("click",function() {
-        if (!tmpDir) {
-            openDirectory(TMP_DIR, "#tmp");
-            checkEnable();
-        } else {
-            alert("Already Opened");
-        }
-    });
     $("#openEtcBtn").on("click",function() {
         if (!etcDir) {
             openDirectory(ETC_DIR, "#etc");
@@ -276,8 +161,6 @@ $(document).ready(function(){
             checkEnable();
         }
     });
-
-    DisablePassButton();
 });
 
 function deleteFile(id) {
@@ -290,7 +173,6 @@ function deleteFile(id) {
         switch (gFiles[Number(id)].path) {
             case HOME_DELETE_DIR: dir = homeDir; selector = "#home"; break;
             case MEDIA_DELETE_DIR: dir = mediaDir; selector = "#media"; break;
-            //case "/usr/share": dir = systemDir; selector = "#system"; break;
             default: break;
         }
         if (dir) {
@@ -307,8 +189,7 @@ function deleteFile(id) {
 }
 
 function checkEnable() {
-    if (homeDir && mediaDir && tmpDir && etcFlag &&
-        usrShareDir && optShareDir && optDbshareDir && optUsrDbspaceDir && optVarKdbDbDir) {
+    if (homeDir && mediaDir && etcFlag) {
         EnablePassButton();
     }
 }
@@ -318,4 +199,4 @@ function backAppsHome() {
         deleteFile(number);
     });
     window.close();
-}
\ No newline at end of file
+}