[Libreoffice-commits] core.git: sw/Module_sw.mk sw/qa sw/UITest_sw_navigator.mk uitest/writer_tests uitest/writer_tests5

[Xisco Fauli (via logerrit)]

 sw/Module_sw.mk                     |    1 +
 sw/UITest_sw_navigator.mk           |   16 ++++++++++++++++
 sw/qa/uitest/navigator/tdf114724.py |    5 +++--
 3 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 26015550759b846b58dbc0ba458a91c135d0a09c
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Fri Oct 23 13:12:12 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Fri Oct 23 19:31:23 2020 +0200

    uitest: move navigator tests to their own folder
    
    Change-Id: Iacc2e21fde8fc126752d0b1fa14cd1f962930d4f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104723
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 05a9fe6b90c2..9f90b23a45fd 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -172,6 +172,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sw,\
 	UITest_sw_findSimilarity \
 	UITest_chapterNumbering \
 	UITest_librelogo \
+	UITest_sw_navigator \
 	UITest_sw_options \
 	UITest_sw_ui_fmtui \
 	UITest_classification \
diff --git a/sw/UITest_sw_navigator.mk b/sw/UITest_sw_navigator.mk
new file mode 100644
index 000000000000..a86522dfb3de
--- /dev/null
+++ b/sw/UITest_sw_navigator.mk
@@ -0,0 +1,16 @@
+# 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,sw_navigator))
+
+$(eval $(call gb_UITest_add_modules,sw_navigator,$(SRCDIR)/sw/qa/uitest,\
+	navigator/ \
+))
+
+$(eval $(call gb_UITest_set_defs,sw_navigator, \
+    TDOC="$(SRCDIR)/sw/qa/uitest/writer_tests/data" \
+))
diff --git a/uitest/writer_tests5/tdf114724.py b/sw/qa/uitest/navigator/tdf114724.py
similarity index 94%
rename from uitest/writer_tests5/tdf114724.py
rename to sw/qa/uitest/navigator/tdf114724.py
index 09341149c242..d7d69b8f2e53 100644
--- a/uitest/writer_tests5/tdf114724.py
+++ b/sw/qa/uitest/navigator/tdf114724.py
@@ -6,10 +6,11 @@
 from uitest.framework import UITestCase
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from uitest.uihelper.common import get_state_as_dict
-from uitest.path import get_srcdir_url
+import org.libreoffice.unotest
+import pathlib
 
 def get_url_for_data_file(file_name):
-    return get_srcdir_url() + "/uitest/writer_tests/data/" + file_name
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
 
 class tdf114724(UITestCase):
 
diff --git a/sw/qa/uitest/writer_tests7/tdf137274.py b/sw/qa/uitest/navigator/tdf137274.py
similarity index 100%
rename from sw/qa/uitest/writer_tests7/tdf137274.py
rename to sw/qa/uitest/navigator/tdf137274.py
diff --git a/uitest/writer_tests/data/tdf114724.odt b/sw/qa/uitest/writer_tests/data/tdf114724.odt
similarity index 100%
rename from uitest/writer_tests/data/tdf114724.odt
rename to sw/qa/uitest/writer_tests/data/tdf114724.odt