[FAMILYHUB][multicolumn,background][fix TSEVEN-6602 and TSEVEN-6606]

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

diff --git a/common/tct-backgrounds-css3-tests/backgrounds/CSS3BG_border_0point5px_dashed_000.html b/common/tct-backgrounds-css3-tests/backgrounds/CSS3BG_border_0point5px_dashed_000.html
index 8f22a05eca1f1c6af47fd9184755ccc4aac95c59..536064ad36e67414fdf2978f4ce58a8f5afebfee 100755 (executable)
--- a/common/tct-backgrounds-css3-tests/backgrounds/CSS3BG_border_0point5px_dashed_000.html
+++ b/common/tct-backgrounds-css3-tests/backgrounds/CSS3BG_border_0point5px_dashed_000.html
@@ -50,7 +50,13 @@ Authors:
         test(function () {
             div.style[headProp("border")] = "0.5px dashed #000";
             var borderWidth = GetCurrentStyle("border-width");
-            assert_equals(borderWidth, "1px", "The border-width value");
+            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");
+            if (armv8 && arch === 'aarch64'){
+                assert_equals(borderWidth, "0.5px", "The border-width value");
+            }else{
+                assert_equals(borderWidth, "1px", "The border-width value");
+            }
             var borderStyle = GetCurrentStyle("border-style");
             assert_equals(borderStyle, "dashed", "The border-style value");
             var borderColor = GetCurrentStyle("border-color");

diff --git a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule-width_initial_value.html b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule-width_initial_value.html
index bb3779440e1aaa671d92ec7a460141f0794f4fcc..1f602d9e29e3c211fdf4174c18e6168008eb5864 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule-width_initial_value.html
+++ b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule-width_initial_value.html
@@ -63,7 +63,11 @@ Authors:
         var column_rule_width = GetCurrentStyle("columnRuleWidth");
         var t = async_test(document.title, {timeout: 500});
         t.step(function () {
-            assert_equals(column_rule_width, "3px", "The div column-rule-width");
+            if(ARMV8 && ARCH === 'aarch64'){
+                assert_equals(column_rule_width, "1.5px", "The div column-rule-width");
+            }else{
+                assert_equals(column_rule_width, "3px", "The div column-rule-width");
+            }
         });
         t.done();
     </script>

diff --git a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_dashed.html b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_dashed.html
index 70b4af4fc7875331dcf3a907d1352f108da71beb..776bd1b1004e34a997aa6b9bc94d9a0a43fcd841 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_dashed.html
+++ b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_dashed.html
@@ -39,6 +39,7 @@ Authors:
     <script type="text/javascript" src="../resources/testharness.js"></script>
     <script type="text/javascript" src="../resources/testharnessreport.js"></script>
     <script type="text/javascript" src="support/cssstyle.js"></script>
+    <script src="support/user.js"></script>
     <style>
         #test{
             height: 100px;
@@ -63,8 +64,13 @@ Authors:
             var propcolumnRuleColor = columnRuleColor.indexOf("rgb(0, 0, 0)") != -1;
             assert_true(propcolumnRuleColor, "The element column-rule-color should not be rgb(0, 0, 0)");
             var columnRuleWidth = GetCurrentStyle("columnRuleWidth");
-            var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
-            assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 0px");
+            if(ARMV8 && ARCH === 'aarch64'){
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("1.5px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 1.5px");
+            }else{
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            }
             var columnRuleStyle = GetCurrentStyle("column-rule-style");
             var propcolumnRuleStyle = columnRuleStyle.indexOf("dashed") != -1;
             assert_true(propcolumnRuleStyle, "The element column-rule-style should not be dashed");

diff --git a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_dotted.html b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_dotted.html
index 51757303cd7b214507fb5e6109cdc736179a7dc9..8d427e391fd70e953950f5698e7cb1ae88b7923a 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_dotted.html
+++ b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_dotted.html
@@ -39,6 +39,7 @@ Authors:
     <script type="text/javascript" src="../resources/testharness.js"></script>
     <script type="text/javascript" src="../resources/testharnessreport.js"></script>
     <script type="text/javascript" src="support/cssstyle.js"></script>
+    <script src="support/user.js"></script>
     <style>
         #test{
             height: 100px;
@@ -63,8 +64,13 @@ Authors:
             var propcolumnRuleColor = columnRuleColor.indexOf("rgb(0, 0, 0)") != -1;
             assert_true(propcolumnRuleColor, "The element column-rule-color should not be rgb(0, 0, 0)");
             var columnRuleWidth = GetCurrentStyle("columnRuleWidth");
-            var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
-            assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 0px");
+            if(ARMV8 && ARCH === 'aarch64'){
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("1.5px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 1.5px");
+            }else{
+              var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
+              assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            }
             var columnRuleStyle = GetCurrentStyle("column-rule-style");
             var propcolumnRuleStyle = columnRuleStyle.indexOf("dotted") != -1;
             assert_true(propcolumnRuleStyle, "The element column-rule-style should not be dotted");

diff --git a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_double.html b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_double.html
index f33fcbd14ad1e9f0fb132e48a3054d3c756c5d8d..1910cfe99bbe3875927738e89877d5734dfccb2b 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_double.html
+++ b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_double.html
@@ -39,6 +39,7 @@ Authors:
     <script type="text/javascript" src="../resources/testharness.js"></script>
     <script type="text/javascript" src="../resources/testharnessreport.js"></script>
     <script type="text/javascript" src="support/cssstyle.js"></script>
+    <script src="support/user.js"></script>
     <style>
         #test{
             height: 100px;
@@ -63,8 +64,13 @@ Authors:
             var propcolumnRuleColor = columnRuleColor.indexOf("rgb(0, 0, 0)") != -1;
             assert_true(propcolumnRuleColor, "The element column-rule-color should not be rgb(0, 0, 0)");
             var columnRuleWidth = GetCurrentStyle("columnRuleWidth");
-            var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
-            assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 0px");
+            if(ARMV8 && ARCH === 'aarch64'){
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("1.5px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 1.5px");
+            }else{
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            }
             var columnRuleStyle = GetCurrentStyle("column-rule-style");
             var propcolumnRuleStyle = columnRuleStyle.indexOf("double") != -1;
             assert_true(propcolumnRuleStyle, "The element column-rule-style should not be double");

diff --git a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_green_inset.html b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_green_inset.html
index c14c26505d8484e608e43471ec84bedff252e734..d154e648006073ddabe4e0dc75f955f3e212f9f8 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_green_inset.html
+++ b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_green_inset.html
@@ -39,6 +39,7 @@ Authors:
     <script type="text/javascript" src="../resources/testharness.js"></script>
     <script type="text/javascript" src="../resources/testharnessreport.js"></script>
     <script type="text/javascript" src="support/cssstyle.js"></script>
+    <script src="support/user.js"></script>
     <style>
         #test{
             height: 100px;
@@ -63,8 +64,13 @@ Authors:
             var propcolumnRuleColor = columnRuleColor.indexOf("rgb(0, 128, 0)") != -1;
             assert_true(propcolumnRuleColor, "The element column-rule-color should not be rgb(255, 0, 0)");
             var columnRuleWidth = GetCurrentStyle("columnRuleWidth");
-            var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
-            assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            if(ARMV8 && ARCH === 'aarch64'){
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("1.5px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 1.5px");
+            }else{
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            }
             var columnRuleStyle = GetCurrentStyle("column-rule-style");
             var propcolumnRuleStyle = columnRuleStyle.indexOf("inset") != -1;
             assert_true(propcolumnRuleStyle, "The element column-rule-style should not be inset");

diff --git a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_green_outset.html b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_green_outset.html
index 702f0bccc23e486a3e6904ef67e77875ac3a870a..6f146563e177482750154f679e3e240117114a01 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_green_outset.html
+++ b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_green_outset.html
@@ -39,6 +39,7 @@ Authors:
     <script type="text/javascript" src="../resources/testharness.js"></script>
     <script type="text/javascript" src="../resources/testharnessreport.js"></script>
     <script type="text/javascript" src="support/cssstyle.js"></script>
+    <script src="support/user.js"></script>
     <style>
         #test{
             height: 100px;
@@ -63,8 +64,13 @@ Authors:
             var propcolumnRuleColor = columnRuleColor.indexOf("rgb(0, 128, 0)") != -1;
             assert_true(propcolumnRuleColor, "The element column-rule-color should not be rgb(255, 0, 0)");
             var columnRuleWidth = GetCurrentStyle("columnRuleWidth");
-            var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
-            assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            if(ARMV8 && ARCH === 'aarch64'){
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("1.5px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 1.5px");
+            }else{
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            }
             var columnRuleStyle = GetCurrentStyle("column-rule-style");
             var propcolumnRuleStyle = columnRuleStyle.indexOf("outset") != -1;
             assert_true(propcolumnRuleStyle, "The element column-rule-style should not be outset");

diff --git a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_green_solid.html b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_green_solid.html
index 7a2e899d9ab435fb12335a57d609cea58e126c45..428dba60afcdd0f214ca6ac81230071207cc42d6 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_green_solid.html
+++ b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_green_solid.html
@@ -39,6 +39,7 @@ Authors:
     <script type="text/javascript" src="../resources/testharness.js"></script>
     <script type="text/javascript" src="../resources/testharnessreport.js"></script>
     <script type="text/javascript" src="support/cssstyle.js"></script>
+    <script src="support/user.js"></script>
     <style>
         #test{
             height: 100px;
@@ -63,8 +64,13 @@ Authors:
             var propcolumnRuleColor = columnRuleColor.indexOf("rgb(0, 128, 0)") != -1;
             assert_true(propcolumnRuleColor, "The element column-rule-color should not be rgb(255, 0, 0)");
             var columnRuleWidth = GetCurrentStyle("columnRuleWidth");
-            var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
-            assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            if(ARMV8 && ARCH === 'aarch64'){
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("1.5px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 1.5px");
+            }else{
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            }
             var columnRuleStyle = GetCurrentStyle("column-rule-style");
             var propcolumnRuleStyle = columnRuleStyle.indexOf("solid") != -1;
             assert_true(propcolumnRuleStyle, "The element column-rule-style should not be solid");

diff --git a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_groove.html b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_groove.html
index 1130a36978e18df53c20b9ecb994bf5207713066..4d1f178c5614fd0085e027fdcbc5ff70315f6151 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_groove.html
+++ b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_groove.html
@@ -39,6 +39,7 @@ Authors:
     <script type="text/javascript" src="../resources/testharness.js"></script>
     <script type="text/javascript" src="../resources/testharnessreport.js"></script>
     <script type="text/javascript" src="support/cssstyle.js"></script>
+    <script src="support/user.js"></script>
     <style>
         #test{
             height: 100px;
@@ -63,8 +64,13 @@ Authors:
             var propcolumnRuleColor = columnRuleColor.indexOf("rgb(0, 0, 0)") != -1;
             assert_true(propcolumnRuleColor, "The element column-rule-color should not be rgb(0, 0, 0)");
             var columnRuleWidth = GetCurrentStyle("columnRuleWidth");
-            var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
-            assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 0px");
+            if(ARMV8 && ARCH === 'aarch64'){
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("1.5px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 1.5px");
+            }else{
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            }
             var columnRuleStyle = GetCurrentStyle("column-rule-style");
             var propcolumnRuleStyle = columnRuleStyle.indexOf("groove") != -1;
             assert_true(propcolumnRuleStyle, "The element column-rule-style should not be groove");

diff --git a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_pink_ridge.html b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_pink_ridge.html
index b4754a76405349479a157d0d3c82eb9daa1d34a8..d0f5eeeb5d5d5feba520d9627ee548f1eba3cd11 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_pink_ridge.html
+++ b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_pink_ridge.html
@@ -39,6 +39,7 @@ Authors:
     <script type="text/javascript" src="../resources/testharness.js"></script>
     <script type="text/javascript" src="../resources/testharnessreport.js"></script>
     <script type="text/javascript" src="support/cssstyle.js"></script>
+    <script src="support/user.js"></script>
     <style>
         #test{
             height: 100px;
@@ -63,8 +64,13 @@ Authors:
             var propcolumnRuleColor = columnRuleColor.indexOf("rgb(255, 192, 203)") != -1;
             assert_true(propcolumnRuleColor, "The element column-rule-color should not be pink");
             var columnRuleWidth = GetCurrentStyle("columnRuleWidth");
-            var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
-            assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            if(ARMV8 && ARCH === 'aarch64'){
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("1.5px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 1.5px");
+            }else{
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            }
             var columnRuleStyle = GetCurrentStyle("column-rule-style");
             var propcolumnRuleStyle = columnRuleStyle.indexOf("ridge") != -1;
             assert_true(propcolumnRuleStyle, "The element column-rule-style should not be ridge");

diff --git a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_solid.html b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_solid.html
index b827a7c4a89e4857b9974abe998f0070a70ea336..0884bdf9bdcfeee4e61fb69bcc3eef6df5cf0626 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_solid.html
+++ b/common/tct-multicolumn-css3-tests/multicolumn/CSS3Multicolumn_column-rule_solid.html
@@ -39,6 +39,7 @@ Authors:
     <script type="text/javascript" src="../resources/testharness.js"></script>
     <script type="text/javascript" src="../resources/testharnessreport.js"></script>
     <script type="text/javascript" src="support/cssstyle.js"></script>
+    <script src="support/user.js"></script>
     <style>
         #test{
             height: 100px;
@@ -63,8 +64,13 @@ Authors:
             var propcolumnRuleColor = columnRuleColor.indexOf("rgb(0, 0, 0)") != -1;
             assert_true(propcolumnRuleColor, "The element column-rule-color should not be rgb(0, 0, 0)");
             var columnRuleWidth = GetCurrentStyle("columnRuleWidth");
-            var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
-            assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 0px");
+            if(ARMV8 && ARCH === 'aarch64'){
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("1.5px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 1.5px");
+            }else{
+                var propcolumnRuleWidth = columnRuleWidth.indexOf("3px") != -1;
+                assert_true(propcolumnRuleWidth, "The element column-rule-width should not be 3px");
+            }
             var columnRuleStyle = GetCurrentStyle("column-rule-style");
             var propcolumnRuleStyle = columnRuleStyle.indexOf("solid") != -1;
             assert_true(propcolumnRuleStyle, "The element column-rule-style should not be solid");

diff --git a/common/tct-multicolumn-css3-tests/multicolumn/support/user.js b/common/tct-multicolumn-css3-tests/multicolumn/support/user.js
index 55246d138dc1bd4a9a7bc36c3253bcea348f9421..e113c2359aa831de84cb964026f374fb59e503d0 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/multicolumn/support/user.js
+++ b/common/tct-multicolumn-css3-tests/multicolumn/support/user.js
@@ -1,4 +1,4 @@
-/*
+/*
 Copyright (c) 2012 Intel Corporation.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -29,6 +29,9 @@ Authors:
 
 */
 
+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 GetCurrentStyle(prop) {
     var div = document.querySelector("#test");
     propprop = headProp(prop);