[Libreoffice-commits] core.git: sc/qa sc/UITest_range_name.mk sc/UITest_statistics.mk sw/qa

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Mar 4 15:00:41 UTC 2019 

 sc/UITest_range_name.mk                    |    5 +++++
 sc/UITest_statistics.mk                    |    2 +-
 sc/qa/uitest/calc_tests/autosum.py         |    5 +++--
 sc/qa/uitest/calc_tests2/standardFilter.py |    8 +++-----
 sc/qa/uitest/calc_tests2/tdf114992.py      |    5 +++--
 sc/qa/uitest/calc_tests2/tdf54018.py       |    8 +++-----
 sc/qa/uitest/calc_tests3/tdf57274.py       |    5 +++--
 sc/qa/uitest/chart/tdf123231.py            |    9 +++------
 sc/qa/uitest/range_name/tdf119954.py       |    8 +++-----
 sc/qa/uitest/search_replace/tdf39959.py    |    8 +++-----
 sc/qa/uitest/statistics/regression.py      |    5 +++--
 sw/qa/uitest/table/tdf81292.py             |    8 +++-----
 12 files changed, 36 insertions(+), 40 deletions(-)

New commits:
commit d515aaa11c42a9d5698380c2288ca7eb65228371
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Mar 4 13:41:23 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Mar 4 16:00:17 2019 +0100

    Fix some UITests to use copies of SRCDIR documents
    
    ...so that running those tests with a read-only SRCDIR succeeds.  (Needed to
    move sc/qa/uitest/calc_tests/data/tdf76731.ods to fit the changes made to
    sc/UITest_statistics.mk; all documents used by that test need to be at the same
    place.)
    
    Change-Id: I5c4a28539b9bacde3ca8983502ceed8e4688c787
    Reviewed-on: https://gerrit.libreoffice.org/68683
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sc/UITest_range_name.mk b/sc/UITest_range_name.mk
index db8146dfd567..fd2e87e98828 100644
--- a/sc/UITest_range_name.mk
+++ b/sc/UITest_range_name.mk
@@ -12,4 +12,9 @@ $(eval $(call gb_UITest_UITest,range_name))
 $(eval $(call gb_UITest_add_modules,range_name,$(SRCDIR)/sc/qa/uitest,\
 	range_name/ \
 ))
+
+$(eval $(call gb_UITest_set_defs,range_name, \
+    TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/sc/UITest_statistics.mk b/sc/UITest_statistics.mk
index 4e668f425e94..aed1387fa930 100644
--- a/sc/UITest_statistics.mk
+++ b/sc/UITest_statistics.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_UITest_add_modules,statistics,$(SRCDIR)/sc/qa/uitest,\
 ))
 
 $(eval $(call gb_UITest_set_defs,statistics, \
-    TDOC="$(SRCDIR)/sc/qa/uitest/calc_tests/data" \
+    TDOC="$(SRCDIR)/sc/qa/uitest/statistics/data" \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sc/qa/uitest/calc_tests/autosum.py b/sc/qa/uitest/calc_tests/autosum.py
index 533c9f3cb42c..2bb4cff76dc8 100644
--- a/sc/qa/uitest/calc_tests/autosum.py
+++ b/sc/qa/uitest/calc_tests/autosum.py
@@ -5,9 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
+import org.libreoffice.unotest
 import os
+import pathlib
 from uitest.uihelper.common import get_state_as_dict
-from uitest.path import get_srcdir_url
 from libreoffice.calc.document import get_sheet_from_doc
 from libreoffice.calc.conditional_format import get_conditional_format_from_sheet
 from uitest.debug import sleep
@@ -15,7 +16,7 @@ from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
 #AutoSum feature test
 def get_url_for_data_file(file_name):
-    return get_srcdir_url() + "/sc/qa/uitest/calc_tests/data/" + file_name
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 class calcAutosum(UITestCase):
 
diff --git a/sc/qa/uitest/calc_tests2/standardFilter.py b/sc/qa/uitest/calc_tests2/standardFilter.py
index 2da4c193e956..6519fe6af6c2 100644
--- a/sc/qa/uitest/calc_tests2/standardFilter.py
+++ b/sc/qa/uitest/calc_tests2/standardFilter.py
@@ -10,13 +10,11 @@ from uitest.uihelper.common import select_pos
 from uitest.uihelper.calc import enter_text_to_cell
 from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
-# import org.libreoffice.unotest
-# import pathlib
-from uitest.path import get_srcdir_url
+import org.libreoffice.unotest
+import pathlib
 #Bug 113979 - Paste unformatted text does not ignore empty cells
 def get_url_for_data_file(file_name):
-#    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-    return get_srcdir_url() + "/sc/qa/uitest/calc_tests/data/" + file_name
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 class standardFilter(UITestCase):
     def test_standard_filter(self):
diff --git a/sc/qa/uitest/calc_tests2/tdf114992.py b/sc/qa/uitest/calc_tests2/tdf114992.py
index b691ab14b845..0e4b30c2ae9e 100644
--- a/sc/qa/uitest/calc_tests2/tdf114992.py
+++ b/sc/qa/uitest/calc_tests2/tdf114992.py
@@ -5,10 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.path import get_srcdir_url
+import org.libreoffice.unotest
+import pathlib
 #Bug:  Delete a sheet in a calc document and LO crashes
 def get_url_for_data_file(file_name):
-    return get_srcdir_url() + "/sc/qa/uitest/calc_tests/data/" + file_name
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 class tdf114992(UITestCase):
     def test_tdf114992_delete_sheet_crash(self):
diff --git a/sc/qa/uitest/calc_tests2/tdf54018.py b/sc/qa/uitest/calc_tests2/tdf54018.py
index 2802ba4cfa8f..b1d31e7515c9 100644
--- a/sc/qa/uitest/calc_tests2/tdf54018.py
+++ b/sc/qa/uitest/calc_tests2/tdf54018.py
@@ -10,13 +10,11 @@ from uitest.uihelper.common import select_pos
 from uitest.uihelper.calc import enter_text_to_cell
 from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
-# import org.libreoffice.unotest
-# import pathlib
-from uitest.path import get_srcdir_url
+import org.libreoffice.unotest
+import pathlib
 #Bug 54018 - EDITING: CRASH sorting cells range with Comments
 def get_url_for_data_file(file_name):
-#    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-    return get_srcdir_url() + "/sc/qa/uitest/calc_tests/data/" + file_name
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 class tdf54018(UITestCase):
     def test_td54018_sort_with_comments(self):
diff --git a/sc/qa/uitest/calc_tests3/tdf57274.py b/sc/qa/uitest/calc_tests3/tdf57274.py
index 9074daf1e2ee..a3c77109cb51 100644
--- a/sc/qa/uitest/calc_tests3/tdf57274.py
+++ b/sc/qa/uitest/calc_tests3/tdf57274.py
@@ -5,9 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
+import org.libreoffice.unotest
 import os
+import pathlib
 from uitest.uihelper.common import get_state_as_dict
-from uitest.path import get_srcdir_url
 from libreoffice.calc.document import get_sheet_from_doc
 from libreoffice.calc.conditional_format import get_conditional_format_from_sheet
 from uitest.debug import sleep
@@ -15,7 +16,7 @@ from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
 #Bug:  Paste Special Link Checkbox fails to insert cell references when the source cell is blank
 def get_url_for_data_file(file_name):
-    return get_srcdir_url() + "/sc/qa/uitest/calc_tests/data/" + file_name
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 class tdf57274(UITestCase):
 
diff --git a/sc/qa/uitest/chart/tdf123231.py b/sc/qa/uitest/chart/tdf123231.py
index a7a0b66c7bc3..11e561803118 100644
--- a/sc/qa/uitest/chart/tdf123231.py
+++ b/sc/qa/uitest/chart/tdf123231.py
@@ -12,13 +12,10 @@ from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_state_as_dict, type_text
 from uitest.debug import sleep
-
-# import org.libreoffice.unotest
-# import pathlib
-from uitest.path import get_srcdir_url
+import org.libreoffice.unotest
+import pathlib
 def get_url_for_data_file(file_name):
-#    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-    return get_srcdir_url() + "/sc/qa/uitest/calc_tests/data/" + file_name
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 #Bug 123231 - Chart set trendline format regression type Power twice
 
diff --git a/sc/qa/uitest/range_name/tdf119954.py b/sc/qa/uitest/range_name/tdf119954.py
index 8b3eeed8d2a8..abda0088218c 100644
--- a/sc/qa/uitest/range_name/tdf119954.py
+++ b/sc/qa/uitest/range_name/tdf119954.py
@@ -13,13 +13,11 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_state_as_dict, type_text
 from uitest.uihelper.keyboard import select_all
 from uitest.debug import sleep
-# import org.libreoffice.unotest
-# import pathlib
-from uitest.path import get_srcdir_url
+import org.libreoffice.unotest
+import pathlib
 
 def get_url_for_data_file(file_name):
-#    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-    return get_srcdir_url() + "/sc/qa/uitest/calc_tests/data/" + file_name
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 #Bug 119954 - Using a second defined database range in formula expression switches to first range.
 
diff --git a/sc/qa/uitest/search_replace/tdf39959.py b/sc/qa/uitest/search_replace/tdf39959.py
index 28b056a92470..1f7c6a7a7bb6 100644
--- a/sc/qa/uitest/search_replace/tdf39959.py
+++ b/sc/qa/uitest/search_replace/tdf39959.py
@@ -12,13 +12,11 @@ from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_state_as_dict, type_text
 from uitest.debug import sleep
-# import org.libreoffice.unotest
-# import pathlib
-from uitest.path import get_srcdir_url
+import org.libreoffice.unotest
+import pathlib
 
 def get_url_for_data_file(file_name):
-#    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-    return get_srcdir_url() + "/sc/qa/uitest/search_replace/data/" + file_name
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 #Bug 39959 - Find-and-replace doesn't search all tables anymore
 
diff --git a/sc/qa/uitest/calc_tests/data/tdf76731.ods b/sc/qa/uitest/statistics/data/tdf76731.ods
similarity index 100%
rename from sc/qa/uitest/calc_tests/data/tdf76731.ods
rename to sc/qa/uitest/statistics/data/tdf76731.ods
diff --git a/sc/qa/uitest/statistics/regression.py b/sc/qa/uitest/statistics/regression.py
index 6f5fd2ca0e27..e04614e48b07 100644
--- a/sc/qa/uitest/statistics/regression.py
+++ b/sc/qa/uitest/statistics/regression.py
@@ -5,7 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.path import get_srcdir_url
 from uitest.uihelper.common import get_state_as_dict
 from uitest.uihelper.common import select_pos
 from uitest.uihelper.calc import enter_text_to_cell
@@ -13,9 +12,11 @@ from libreoffice.calc.document import get_sheet_from_doc
 from uitest.debug import sleep
 from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
+import org.libreoffice.unotest
+import pathlib
 
 def get_url_for_data_file(file_name):
-    return get_srcdir_url() + "/sc/qa/uitest/statistics/data/" + file_name
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 class regression(UITestCase):
     def test_regression_row(self):
diff --git a/sw/qa/uitest/table/tdf81292.py b/sw/qa/uitest/table/tdf81292.py
index cfb9f9572dbe..d8a2347ecfaa 100644
--- a/sw/qa/uitest/table/tdf81292.py
+++ b/sw/qa/uitest/table/tdf81292.py
@@ -9,15 +9,13 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_state_as_dict, type_text
 import time
 from uitest.debug import sleep
-# import org.libreoffice.unotest
-# import pathlib
-from uitest.path import get_srcdir_url
+import org.libreoffice.unotest
+import pathlib
 
 #Bug 81292 - TABLE: Crashes on sorting table
 
 def get_url_for_data_file(file_name):
-#    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
-   return get_srcdir_url() + "/sw/qa/uitest/writer_tests/data/" + file_name
+   return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 class tdf81292(UITestCase):

More information about the Libreoffice-commits mailing list