[Libreoffice-commits] core.git: uitest/impress_tests uitest/writer_tests1

[Xisco Fauli (via logerrit)]

 uitest/impress_tests/backgrounds.py |    8 +++++---
 uitest/writer_tests1/pageDialog.py  |    8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit bc6eb8e096416d42d2308a529d5c0d81778dca60
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Mon Mar 16 19:30:30 2020 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Mon Mar 16 22:02:39 2020 +0100

    uitest: use hex instead of int for colors
    
    Change-Id: I7309a546546637a1837df8ac99807c2deb22c72a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90589
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/uitest/impress_tests/backgrounds.py b/uitest/impress_tests/backgrounds.py
index b0c36db36ab4..6e2493b063f1 100644
--- a/uitest/impress_tests/backgrounds.py
+++ b/uitest/impress_tests/backgrounds.py
@@ -18,13 +18,15 @@ class ImpressBackgrounds(UITestCase):
         if btn == 'btnnone':
             self.assertEqual(document.DrawPages.getByIndex(0).Background, None)
         elif btn == 'btncolor':
-            self.assertEqual(document.DrawPages.getByIndex(0).Background.FillColor, 7512015)
-            self.assertEqual(document.DrawPages.getByIndex(0).Background.FillColor, 7512015)
+            self.assertEqual(
+              hex(document.DrawPages.getByIndex(0).Background.FillColor), '0x729fcf')
+            self.assertEqual(
+              hex(document.DrawPages.getByIndex(0).Background.FillColor), '0x729fcf')
         elif btn == 'btngradient':
             self.assertEqual(
               document.DrawPages.getByIndex(0).Background.FillGradient.Style, LINEAR)
             self.assertEqual(
-              document.DrawPages.getByIndex(0).Background.FillGradient.StartColor, 14543051)
+              hex(document.DrawPages.getByIndex(0).Background.FillGradient.StartColor), '0xdde8cb')
             self.assertEqual(
               document.DrawPages.getByIndex(0).Background.FillGradient.Angle, 300)
             self.assertEqual(
diff --git a/uitest/writer_tests1/pageDialog.py b/uitest/writer_tests1/pageDialog.py
index 233c269d891f..73e523444c6e 100644
--- a/uitest/writer_tests1/pageDialog.py
+++ b/uitest/writer_tests1/pageDialog.py
@@ -36,16 +36,16 @@ class WriterPageDialog(UITestCase):
                 document.StyleFamilies.PageStyles.Standard.BackColor, -1)
         elif btn == 'btncolor':
             self.assertEqual(
-                document.StyleFamilies.PageStyles.Standard.BackColor, 7512015)
+                hex(document.StyleFamilies.PageStyles.Standard.BackColor), '0x729fcf')
             self.assertEqual(
-                document.StyleFamilies.PageStyles.Standard.FillColor, 7512015)
+                hex(document.StyleFamilies.PageStyles.Standard.FillColor), '0x729fcf')
             self.assertEqual(
-                document.StyleFamilies.PageStyles.Standard.FillColor, 7512015)
+                hex(document.StyleFamilies.PageStyles.Standard.FillColor), '0x729fcf')
         elif btn == 'btngradient':
             self.assertEqual(
                 document.StyleFamilies.PageStyles.Standard.FillGradient.Style, LINEAR)
             self.assertEqual(
-                document.StyleFamilies.PageStyles.Standard.FillGradient.StartColor, 14543051)
+                hex(document.StyleFamilies.PageStyles.Standard.FillGradient.StartColor), '0xdde8cb')
             self.assertEqual(
                 document.StyleFamilies.PageStyles.Standard.FillGradient.Angle, 300)
             self.assertEqual(