[Libreoffice-commits] core.git: 2 commits - sc/Module_sc.mk sc/qa sc/UITest_hide_cols.mk uitest/libreoffice

[Markus Mohrhard]

 sc/Module_sc.mk                     |    1 
 sc/UITest_hide_cols.mk              |   15 ++++++++++++
 sc/qa/uitest/hide_cols/tdf95306.py  |   42 ++++++++++++++++++++++++++++++++++++
 uitest/libreoffice/calc/document.py |   11 +++++++++
 4 files changed, 69 insertions(+)

New commits:
commit 135cc026bcbf77ced58c7a8b85604edba7c2d5df
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Mar 18 04:48:06 2017 +0100

    add test for tdf#95306
    
    Change-Id: I5f7b38eda7555f0d485318f1b43cf7c890260a89

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index d1cd0fd72c76..31c1a58b7d81 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -140,6 +140,7 @@ $(eval $(call gb_Module_add_screenshot_targets,sc,\
 $(eval $(call gb_Module_add_uicheck_targets,sc,\
 	UITest_conditional_format \
 	UITest_range_name \
+	UITest_hide_cols \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_hide_cols.mk b/sc/UITest_hide_cols.mk
new file mode 100644
index 000000000000..b265505cec1a
--- /dev/null
+++ b/sc/UITest_hide_cols.mk
@@ -0,0 +1,15 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UITest_UITest,hide_cols))
+
+$(eval $(call gb_UITest_add_modules,hide_cols,$(SRCDIR)/sc/qa/uitest,\
+	hide_cols/ \
+))
+# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/uitest/hide_cols/tdf95306.py b/sc/qa/uitest/hide_cols/tdf95306.py
new file mode 100644
index 000000000000..63f976849ee3
--- /dev/null
+++ b/sc/qa/uitest/hide_cols/tdf95306.py
@@ -0,0 +1,42 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+from uitest.framework import UITestCase
+from libreoffice.calc.document import get_column
+
+import time
+
+def get_column_hidden(doc, index):
+    column = get_column(doc, index)
+    val = column.getPropertyValue("IsVisible")
+    return not val
+
+class HideDisjointColumns(UITestCase):
+
+    def test_hide_columns(self):
+        self.ui_test.create_doc_in_start_center("calc")
+        xTopWindow = self.xUITest.getTopFocusWindow()
+
+        gridwin = xTopWindow.getChild("grid_window")
+        gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B1"}))
+        gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "D1", "EXTEND":"true"}))
+
+        doc = self.ui_test.get_component()
+        self.assertFalse(get_column_hidden(doc, 1))
+        self.assertFalse(get_column_hidden(doc, 3))
+        self.ui_test._xUITest.executeCommand(".uno:HideColumn")
+        self.assertTrue(get_column_hidden(doc, 1))
+        self.assertTrue(get_column_hidden(doc, 3))
+        self.ui_test._xUITest.executeCommand(".uno:Undo")
+        self.assertFalse(get_column_hidden(doc, 1))
+        self.assertFalse(get_column_hidden(doc, 3))
+
+        self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
commit a22bec478a5fcb1423046d8d2f5d897aa9aa0440
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Mar 18 04:47:03 2017 +0100

    uitest: add method to get the column object from a spreadsheet doc
    
    Change-Id: I594779ad7b3fe97a1055ad9c999fe6be126875fb

diff --git a/uitest/libreoffice/calc/document.py b/uitest/libreoffice/calc/document.py
index aff34020a650..a251f29b2490 100644
--- a/uitest/libreoffice/calc/document.py
+++ b/uitest/libreoffice/calc/document.py
@@ -26,4 +26,15 @@ def get_cell_by_position(document, tab, column, row):
     sheet = get_sheet_from_doc(document, tab)
     return sheet.getCellByPosition(column, row)
 
+def get_column(document, column, tab = 0):
+    """ Get the column object through the column index
+
+    Keyword arguments:
+    document -- The document that should be used
+    tab -- The 0-based sheet number
+    column -- The 0-based column number
+    """
+    sheet = get_sheet_from_doc(document, tab)
+    return sheet.getColumns().getByIndex(column)
+
 # vim: set shiftwidth=4 softtabstop=4 expandtab: