From: chen <chen89.chen@samsung.com>
Date: Tue, 5 Sep 2023 02:53:41 +0000 (+0800)
Subject: [common][widgetservice][fix TSEVEN-4954 handle armv8 aarch64 support]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b39000711f6db8adabfc5529dacd61f9dd6942fc;p=test%2Ftct%2Fweb%2Fapi.git

[common][widgetservice][fix TSEVEN-4954 handle armv8 aarch64 support]

Change-Id: Ic6df599d961877d8400383263bb3b385e712a8ca
Signed-off-by: chen <chen89.chen@samsung.com>
---

diff --git a/common/tct-widgetservice-tizen-tests/tests.css b/common/tct-widgetservice-tizen-tests/tests.css
index c2ba69b3d..135fa57d3 100755
--- a/common/tct-widgetservice-tizen-tests/tests.css
+++ b/common/tct-widgetservice-tizen-tests/tests.css
@@ -1,132 +1,132 @@
-@charset "UTF-8";
-/* CSS Document */
-#testcasepage div,
-#testcasepage h1,
-#testcasepage p,
-#testcasepage table,
-#testcasepage tr,
-#testcasepage th,
-#testcasepage td {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-weight: inherit;
-  font-style: inherit;
-  font-size: 0.96em;
-  font-family: arial;
-  vertical-align: baseline;
-}
-
-#testcasepage p {
-  text-align: left;
-}
-
-#suite_title {
-  text-align: left;
-}
-
-#btc {
-  text-align: right;
-}
-
-#testcasepage table {
-  border-collapse: separate;
-  border-spacing: 0;
-  margin-bottom: 1.4em;
-  vertical-align: middle;
-}
-
-#testcasepage th,
-#testcasepage td {
-  text-align: left;
-  font-weight: normal;
-  padding: 4px 10px 4px 5px;
-  vertical-align: middle;
-}
-
-#cases table {
-  width: 101%;
-}
-
-#fail_cases table {
-  width: 101%;
-}
-
-#title table {
-  width: 101%;
-}
-
-#device table {
-  width: 50%;
-}
-
-#summary table {
-  width: 50%;
-}
-
-#testcasepage th {
-  border-bottom: 1px solid #000;
-  background-color: #AAAAAA;
-  border-left: 1px solid #000;
-  border-top: 1px solid #000;
-  color: #000;
-  font-weight: bold;
-  vertical-align: bottom;
-}
-
-#testcasepage th:last-child,
-#testcasepage td:last-child {
-  border-right: 1px solid #000;
-}
-
-#testcasepage td {
-  border-left: 1px solid;
-  font-weight: normal;
-  border-bottom: 1px solid;
-}
-
-#testcasepage td.yellow_rate {
-  background-color: #ffcc00;
-}
-
-#testcasepage td.green_rate {
-  background-color: #33cc33;
-}
-
-#testcasepage td.dgreen_rate {
-  background-color: #339933;
-}
-
-#testcasepage td.red_rate {
-  background-color: #FF3333;
-}
-
-#title table,
-#title tr,
-#title td {
-  border-left: none;
-  border-bottom: none;
-  text-align: center;
-}
-
-#title td:last-child {
-  border-right: none;
-}
-
-#testcasepage h1 {
-  font-size: 2em;
-  font-family: Arial, sans-serif;
-  font-weight: bold;
-  line-height: 1;
-  color: #000;
-  margin-bottom: 0.75em;
-  padding-top: 0.25em;
-  font-weight: bold;
-}
-
-#goTopBtn {
-  right: 0px;
-  bottom: 0px;
-  position: fixed; +position: absolute;
-  top: expression(parseInt(document.body.scrollTop) + document.body.clientHeight - 40);
-}
+@charset "UTF-8";
+/* CSS Document */
+#testcasepage div,
+#testcasepage h1,
+#testcasepage p,
+#testcasepage table,
+#testcasepage tr,
+#testcasepage th,
+#testcasepage td {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-weight: inherit;
+  font-style: inherit;
+  font-size: 0.96em;
+  font-family: arial;
+  vertical-align: baseline;
+}
+
+#testcasepage p {
+  text-align: left;
+}
+
+#suite_title {
+  text-align: left;
+}
+
+#btc {
+  text-align: right;
+}
+
+#testcasepage table {
+  border-collapse: separate;
+  border-spacing: 0;
+  margin-bottom: 1.4em;
+  vertical-align: middle;
+}
+
+#testcasepage th,
+#testcasepage td {
+  text-align: left;
+  font-weight: normal;
+  padding: 4px 10px 4px 5px;
+  vertical-align: middle;
+}
+
+#cases table {
+  width: 101%;
+}
+
+#fail_cases table {
+  width: 101%;
+}
+
+#title table {
+  width: 101%;
+}
+
+#device table {
+  width: 50%;
+}
+
+#summary table {
+  width: 50%;
+}
+
+#testcasepage th {
+  border-bottom: 1px solid #000;
+  background-color: #AAAAAA;
+  border-left: 1px solid #000;
+  border-top: 1px solid #000;
+  color: #000;
+  font-weight: bold;
+  vertical-align: bottom;
+}
+
+#testcasepage th:last-child,
+#testcasepage td:last-child {
+  border-right: 1px solid #000;
+}
+
+#testcasepage td {
+  border-left: 1px solid;
+  font-weight: normal;
+  border-bottom: 1px solid;
+}
+
+#testcasepage td.yellow_rate {
+  background-color: #ffcc00;
+}
+
+#testcasepage td.green_rate {
+  background-color: #33cc33;
+}
+
+#testcasepage td.dgreen_rate {
+  background-color: #339933;
+}
+
+#testcasepage td.red_rate {
+  background-color: #FF3333;
+}
+
+#title table,
+#title tr,
+#title td {
+  border-left: none;
+  border-bottom: none;
+  text-align: center;
+}
+
+#title td:last-child {
+  border-right: none;
+}
+
+#testcasepage h1 {
+  font-size: 2em;
+  font-family: Arial, sans-serif;
+  font-weight: bold;
+  line-height: 1;
+  color: #000;
+  margin-bottom: 0.75em;
+  padding-top: 0.25em;
+  font-weight: bold;
+}
+
+#goTopBtn {
+  right: 0px;
+  bottom: 0px;
+  position: fixed; +position: absolute;
+  top: expression(parseInt(document.body.scrollTop) + document.body.clientHeight - 40);
+}
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetChangeCallback_onchange.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetChangeCallback_onchange.html
index 074f7c4b0..6578611e1 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetChangeCallback_onchange.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetChangeCallback_onchange.html
@@ -66,8 +66,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -75,8 +75,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetContentCallback_onsuccess.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetContentCallback_onsuccess.html
index d443379b1..4b4ca5577 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetContentCallback_onsuccess.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetContentCallback_onsuccess.html
@@ -68,8 +68,8 @@ t.step(function () {
         wdInstance.getContent(contentSuccessCb, contentErrorCb);
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -77,8 +77,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_changeUpdatePeriod.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_changeUpdatePeriod.html
index cd4343607..f7aa4af08 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_changeUpdatePeriod.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_changeUpdatePeriod.html
@@ -58,8 +58,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -67,8 +67,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_changeUpdatePeriod_exist.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_changeUpdatePeriod_exist.html
index f574b22b2..4736a702a 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_changeUpdatePeriod_exist.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_changeUpdatePeriod_exist.html
@@ -57,8 +57,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -66,8 +66,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_changeUpdatePeriod_seconds_invalid.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_changeUpdatePeriod_seconds_invalid.html
index 45d701b21..24c508234 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_changeUpdatePeriod_seconds_invalid.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_changeUpdatePeriod_seconds_invalid.html
@@ -59,8 +59,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -68,8 +68,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_extend.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_extend.html
index c1a2244ca..49f960e04 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_extend.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_extend.html
@@ -57,8 +57,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -66,8 +66,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent.html
index efab3eead..eaf71f7d8 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent.html
@@ -66,8 +66,8 @@ t.step(function () {
         retVal = wdInstance.getContent(contentSuccessCb, contentErrorCb);
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -75,8 +75,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_errorCallback_TypeMismatch.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_errorCallback_TypeMismatch.html
index 3bd577bd3..df1409bc9 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_errorCallback_TypeMismatch.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_errorCallback_TypeMismatch.html
@@ -67,8 +67,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -76,8 +76,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_errorCallback_invalid_cb.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_errorCallback_invalid_cb.html
index 9d67751b7..274667f58 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_errorCallback_invalid_cb.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_errorCallback_invalid_cb.html
@@ -70,8 +70,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -79,8 +79,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_exist.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_exist.html
index 5648c42d9..0efc8a673 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_exist.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_exist.html
@@ -57,8 +57,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -66,8 +66,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_misarg.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_misarg.html
index 4d7d1ffba..a0e828b46 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_misarg.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_misarg.html
@@ -59,8 +59,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -68,8 +68,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_successCallback_TypeMismatch.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_successCallback_TypeMismatch.html
index 039a2f475..f2c2f2102 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_successCallback_TypeMismatch.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_successCallback_TypeMismatch.html
@@ -67,8 +67,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -76,8 +76,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_successCallback_invalid_cb.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_successCallback_invalid_cb.html
index e3b666e75..b21801d0b 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_successCallback_invalid_cb.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_getContent_successCallback_invalid_cb.html
@@ -70,8 +70,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -79,8 +79,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_id_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_id_attribute.html
index 9711a0e8a..4cba84a49 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_id_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_id_attribute.html
@@ -57,8 +57,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -66,8 +66,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent.html
index f2336d414..db0d78933 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent.html
@@ -59,8 +59,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -68,8 +68,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent_data_TypeMismatch.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent_data_TypeMismatch.html
index 8d80e64c7..1743da6d6 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent_data_TypeMismatch.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent_data_TypeMismatch.html
@@ -63,8 +63,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -72,8 +72,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent_exist.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent_exist.html
index d01029821..445cb0b22 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent_exist.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent_exist.html
@@ -57,8 +57,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -66,8 +66,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent_misarg.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent_misarg.html
index 4b5fa3907..83bf6d3cf 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent_misarg.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_sendContent_misarg.html
@@ -59,8 +59,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -68,8 +68,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_widget_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_widget_attribute.html
index 01ced8eb2..a4088363d 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_widget_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstance_widget_attribute.html
@@ -60,8 +60,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -69,8 +69,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstancesCallback_onsuccess.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstancesCallback_onsuccess.html
index ea8a4ea31..bca7a7cd5 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstancesCallback_onsuccess.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetInstancesCallback_onsuccess.html
@@ -57,8 +57,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -66,8 +66,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetServiceManager_getWidget.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetServiceManager_getWidget.html
index c364d5801..18c4ce068 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetServiceManager_getWidget.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetServiceManager_getWidget.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_extend.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_extend.html
index 7c5c95175..5f3198aad 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_extend.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_extend.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget, wdVariant;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_height_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_height_attribute.html
index e5b2ca08d..d56e91558 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_height_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_height_attribute.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget, wdVariant;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_needsFrame_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_needsFrame_attribute.html
index acb6e7c22..bd2a4d5d9 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_needsFrame_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_needsFrame_attribute.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget, wdVariant;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_needsMouseEvents_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_needsMouseEvents_attribute.html
index 4a147144c..5aab7096d 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_needsMouseEvents_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_needsMouseEvents_attribute.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget, wdVariant;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_needsTouchEffect_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_needsTouchEffect_attribute.html
index 6cb4e046d..c858287e5 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_needsTouchEffect_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_needsTouchEffect_attribute.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget, wdVariant;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_previewImagePath_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_previewImagePath_attribute.html
index 3536e4f38..a8c6d55c9 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_previewImagePath_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_previewImagePath_attribute.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget, wdVariant;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_sizeType_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_sizeType_attribute.html
index eeadc604d..900399746 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_sizeType_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_sizeType_attribute.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget, wdVariant, sizeTypeRange;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_width_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_width_attribute.html
index 5ad1f4800..3f395b6c5 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_width_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariant_width_attribute.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget, wdVariant;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariantsCallback_onsuccess.html b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariantsCallback_onsuccess.html
index a1e7ccafe..49d6e709c 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariantsCallback_onsuccess.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/WidgetVariantsCallback_onsuccess.html
@@ -45,8 +45,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -54,8 +54,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener.html
index decb8f846..82c009426 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener.html
@@ -60,8 +60,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -69,8 +69,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_callback_TypeMismatch.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_callback_TypeMismatch.html
index 69c11d0e6..e72c77e24 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_callback_TypeMismatch.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_callback_TypeMismatch.html
@@ -37,9 +37,10 @@ Authors:
 
 test(function () {
     var callback, i, conversionTable, exceptionName, id, myWidget;
-
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    console.log(ARCH);
+    console.log(ARMV8);
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -47,8 +48,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_callback_invalid_cb.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_callback_invalid_cb.html
index c698280a6..95c7ee2d0 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_callback_invalid_cb.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_callback_invalid_cb.html
@@ -37,9 +37,8 @@ Authors:
 
 test(function () {
     var callback, i, incorrectListener, exceptionName, id, myWidget;
-
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -47,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
@@ -56,7 +55,6 @@ test(function () {
             console.log(id);
         }
     }
-
     myWidget = tizen.widgetservice.getWidget(id);
     incorrectListener = getListenerConversionExceptions(["onchange"]);
     for(i = 0; i < incorrectListener.length; i++) {
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_exist.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_exist.html
index 76dc569f4..2973c310b 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_exist.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_exist.html
@@ -36,10 +36,10 @@ Authors:
 //==== TEST_CRITERIA ME
 
 test(function () {
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
+    if(ARMV7 || ARMV8){
         var id = "apiwidserv.widgetarm", myWidget;
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
+    else if(X86){
         var id = "apiwidserv.widgetx86", myWidget;
     }
 
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_misarg.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_misarg.html
index 04bb609b2..301c334ab 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_misarg.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_addStateChangeListener_misarg.html
@@ -36,10 +36,10 @@ Authors:
 //==== TEST_CRITERIA MMA
 
 test(function () {
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
+    if(ARMV7 || ARMV8){
         var id = "apiwidserv.widgetarm", myWidget;
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
+    else if(X86){
         var id = "apiwidserv.widgetx86", myWidget;
     }
 
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_applicationId_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_applicationId_attribute.html
index 423dcb2d2..c7f59f1f2 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_applicationId_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_applicationId_attribute.html
@@ -35,10 +35,10 @@ Authors:
 //==== TEST_CRITERIA AE AT ARO
 
 test(function () {
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
+    if(ARMV7 || ARMV8){
         var id = "apiwidserv.widgetarm", myWidget;
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
+    else if(X86){
         var id = "apiwidserv.widgetx86", myWidget;
     }
 
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_extend.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_extend.html
index 679fe6979..4ebc025c0 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_extend.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_extend.html
@@ -35,10 +35,10 @@ Authors:
 //==== TEST_CRITERIA OBX
 
 test(function () {
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
+    if(ARMV7 || ARMV8){
         var id = "apiwidserv.widgetarm", myWidget;
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
+    else if(X86){
         var id = "apiwidserv.widgetx86", myWidget;
     }
 
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances.html
index 5197d1427..7ea04544e 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances.html
@@ -52,8 +52,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -61,8 +61,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_errorCallback_TypeMismatch.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_errorCallback_TypeMismatch.html
index 8954841e7..1a38cc4ae 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_errorCallback_TypeMismatch.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_errorCallback_TypeMismatch.html
@@ -43,8 +43,8 @@ t.step(function () {
         assert_unreached("successCallback should not be invoked");
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -52,8 +52,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_errorCallback_invalid_cb.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_errorCallback_invalid_cb.html
index 5cea5dfaf..1ca094f34 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_errorCallback_invalid_cb.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_errorCallback_invalid_cb.html
@@ -49,8 +49,8 @@ t.step(function () {
         assert_unreached("successCallback should not be invoked");
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -58,8 +58,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_errorCallback_invoked_NotFoundError.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_errorCallback_invoked_NotFoundError.html
index 8d1ed2e77..a0e10b52f 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_errorCallback_invoked_NotFoundError.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_errorCallback_invoked_NotFoundError.html
@@ -48,8 +48,8 @@ t.step(function () {
         assert_unreached("successCallback should not be invoked");
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -57,8 +57,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_exist.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_exist.html
index 47c6b193a..c975d28d5 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_exist.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_exist.html
@@ -35,10 +35,10 @@ Authors:
 //==== TEST_CRITERIA ME
 
 test(function () {
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
+    if(ARMV7 || ARMV8){
         var id = "apiwidserv.widgetarm", myWidget;
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
+    else if(X86){
         var id = "apiwidserv.widgetx86", myWidget;
     }
 
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_misarg.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_misarg.html
index fd030bc46..2cdf9a7c9 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_misarg.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_misarg.html
@@ -35,10 +35,10 @@ Authors:
 //==== TEST_CRITERIA MMA
 
 test(function () {
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
+    if(ARMV7 || ARMV8){
         var id = "apiwidserv.widgetarm", myWidget;
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
+    else if(X86){
         var id = "apiwidserv.widgetx86", myWidget;
     }
 
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_successCallback_TypeMismatch.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_successCallback_TypeMismatch.html
index a3df3b4b5..f2fcd91e7 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_successCallback_TypeMismatch.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_successCallback_TypeMismatch.html
@@ -39,8 +39,8 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), i, conversionTable, id, myWidget;
 
 t.step(function () {
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -48,8 +48,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_successCallback_invalid_cb.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_successCallback_invalid_cb.html
index 3343c2ca5..5d883f08f 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_successCallback_invalid_cb.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_successCallback_invalid_cb.html
@@ -45,8 +45,8 @@ t.step(function () {
         })
     };
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -54,8 +54,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_with_errorCallback.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_with_errorCallback.html
index 1fd4b230c..a7cb3df3c 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_with_errorCallback.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getInstances_with_errorCallback.html
@@ -56,8 +56,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -65,8 +65,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getName.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getName.html
index 399d44938..047d99573 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getName.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getName.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget, retVal;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getName_exist.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getName_exist.html
index 3defefdff..e3670cad3 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getName_exist.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getName_exist.html
@@ -35,10 +35,10 @@ Authors:
 //==== TEST_CRITERIA ME
 
 test(function () {
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
+    if(ARMV7 || ARMV8){
         var id = "apiwidserv.widgetarm", myWidget;
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
+    else if(X86){
         var id = "apiwidserv.widgetx86", myWidget;
     }
 
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getName_with_locale.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getName_with_locale.html
index d497f988e..a65cdb525 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getName_with_locale.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getName_with_locale.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget, retVal;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariant.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariant.html
index 5440277b1..04502a0b8 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariant.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariant.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget, retVal;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
@@ -55,7 +55,6 @@ test(function () {
             console.log(id);
         }
     }
-
     myWidget = tizen.widgetservice.getWidget(id);
     retVal = myWidget.getVariant("4x4");
     assert_type(retVal, "object", "getVariant should return Object");
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariant_exist.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariant_exist.html
index b8c205357..26c516ae0 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariant_exist.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariant_exist.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariant_sizeType_TypeMismatch.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariant_sizeType_TypeMismatch.html
index c52f67d98..a4fd64050 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariant_sizeType_TypeMismatch.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariant_sizeType_TypeMismatch.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget, i, conversionTable;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants.html
index 31cb3dd4c..86ccf8e59 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants.html
@@ -45,8 +45,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -54,8 +54,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_errorCallback_TypeMismatch.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_errorCallback_TypeMismatch.html
index af655c138..d70ab4e21 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_errorCallback_TypeMismatch.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_errorCallback_TypeMismatch.html
@@ -44,8 +44,8 @@ t.step(function () {
         assert_unreached("successCallback should not be invoked");
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -53,8 +53,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_errorCallback_invalid_cb.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_errorCallback_invalid_cb.html
index 3c04da8b9..3e13d2c16 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_errorCallback_invalid_cb.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_errorCallback_invalid_cb.html
@@ -50,8 +50,8 @@ t.step(function () {
         assert_unreached("successCallback should not be invoked");
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -59,8 +59,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_exist.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_exist.html
index dd8068a4d..c442990a2 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_exist.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_exist.html
@@ -38,8 +38,8 @@ Authors:
 test(function () {
     var id, myWidget;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -47,8 +47,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_misarg.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_misarg.html
index 8ea9900f1..6300c4ba5 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_misarg.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_misarg.html
@@ -38,8 +38,8 @@ Authors:
 test(function () {
     var id, myWidget;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -47,8 +47,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_successCallback_TypeMismatch.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_successCallback_TypeMismatch.html
index c1658f5d3..30f3bb1e6 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_successCallback_TypeMismatch.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_successCallback_TypeMismatch.html
@@ -40,8 +40,8 @@ setup({timeout: 90000});
 var t = async_test(document.title, {timeout: 90000}), i, conversionTable, id, myWidget;
 
 t.step(function () {
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -49,8 +49,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_successCallback_invalid_cb.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_successCallback_invalid_cb.html
index 87931d42f..db6d9651c 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_successCallback_invalid_cb.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_successCallback_invalid_cb.html
@@ -46,8 +46,8 @@ t.step(function () {
         })
     };
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -55,8 +55,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_with_errorCallback.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_with_errorCallback.html
index d037fec70..b4763dd91 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_with_errorCallback.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_getVariants_with_errorCallback.html
@@ -49,8 +49,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -58,8 +58,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_id_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_id_attribute.html
index f50896fc4..11ff15106 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_id_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_id_attribute.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_noDisplay_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_noDisplay_attribute.html
index 51592d206..a07ab1eb1 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_noDisplay_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_noDisplay_attribute.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_packageId_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_packageId_attribute.html
index 823054720..0f024eb6b 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_packageId_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_packageId_attribute.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_removeStateChangeListener.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_removeStateChangeListener.html
index 985d78e92..17d20a612 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_removeStateChangeListener.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_removeStateChangeListener.html
@@ -60,8 +60,8 @@ t.step(function () {
         t.done();
     });
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -69,8 +69,8 @@ t.step(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_removeStateChangeListener_exist.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_removeStateChangeListener_exist.html
index 8a8d7c550..34b865084 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_removeStateChangeListener_exist.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_removeStateChangeListener_exist.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_setupApplicationId_attribute.html b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_setupApplicationId_attribute.html
index b76907012..7511e8747 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/Widget_setupApplicationId_attribute.html
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/Widget_setupApplicationId_attribute.html
@@ -37,8 +37,8 @@ Authors:
 test(function () {
     var id, myWidget;
 
-    if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'aarch64'){
+    if(ARMV7 || ARMV8){
+        if(ARCH === 'aarch64'){
             id = "apiwidserv.widgetaarch64";
             console.log(id);
         }else{
@@ -46,8 +46,8 @@ test(function () {
             console.log(id);
         }
     }
-    else if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86")){
-        if(tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch") === 'x86_64'){
+    else if(X86){
+        if(ARCH === 'x86_64'){
             id = "apiwidserv.widgetx86_64";
             console.log(id);
         }else{
diff --git a/common/tct-widgetservice-tizen-tests/widgetservice/support/unitcommon.js b/common/tct-widgetservice-tizen-tests/widgetservice/support/unitcommon.js
index 93eb1e14a..ca308980c 100755
--- a/common/tct-widgetservice-tizen-tests/widgetservice/support/unitcommon.js
+++ b/common/tct-widgetservice-tizen-tests/widgetservice/support/unitcommon.js
@@ -47,6 +47,10 @@ UNKNOWN_EXCEPTION = {name: 'UnknownError'};
 INVALID_STATE_EXCEPTION = {name: 'InvalidStateError'};
 INVALID_ACCESS_EXCEPTION = {name: 'InvalidAccessError'};
 
+var ARMV7 = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv7");
+var X86 = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.x86");
+var ARMV8 = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch.armv8");
+var ARCH = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch");
 (function () {
    var head_src = document.head.innerHTML;
    if (head_src.search(/\/testharness.js\W/) === -1) {