[Libreoffice-commits] core.git: 4 commits - uitest/impress_tests uitest/Module_uitest.mk uitest/UITest_demo_ui.mk uitest/UITest_impress_demo.mk vcl/source

[Markus Mohrhard]

 uitest/Module_uitest.mk               |    2 ++
 uitest/UITest_demo_ui.mk              |   16 ++++++++++++++++
 uitest/UITest_impress_demo.mk         |   15 +++++++++++++++
 uitest/impress_tests/impress_demo.txt |    4 ++++
 uitest/impress_tests/start.py         |   12 ++++++------
 vcl/source/outdev/bitmap.cxx          |    2 +-
 6 files changed, 44 insertions(+), 7 deletions(-)

New commits:
commit 4d0d3e71cce879c7a882ca3eb2bc4a713c945c7c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jun 18 19:37:00 2016 +0200

    uitest: add the demo ui uitest
    
    That test just shows features of the test and the use of different UI
    objects.
    
    Change-Id: I49e9fa2d42634951ae5a78aa3a9bf79fefacd298

diff --git a/uitest/Module_uitest.mk b/uitest/Module_uitest.mk
index ac5c322..7246bd1 100644
--- a/uitest/Module_uitest.mk
+++ b/uitest/Module_uitest.mk
@@ -14,4 +14,5 @@ $(eval $(call gb_Module_add_uicheck_targets,uitest,\
     UITest_calc_demo \
     UITest_writer_demo \
     UITest_impress_demo \
+    UITest_demo_ui \
 ))
diff --git a/uitest/UITest_demo_ui.mk b/uitest/UITest_demo_ui.mk
new file mode 100644
index 0000000..03da9bb
--- /dev/null
+++ b/uitest/UITest_demo_ui.mk
@@ -0,0 +1,16 @@
+# -*- 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,demo_ui))
+
+$(eval $(call gb_UITest_add_modules,demo_ui,$(SRCDIR)/uitest,\
+	demo_ui/demo_ui.txt \
+))
+
+# vim: set noet sw=4 ts=4:
commit e672eb7a08aa839481d13bf4aadaa7456824e0c9
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jun 18 19:33:01 2016 +0200

    uitest: also add the impress uitest demo to the makefiles
    
    Change-Id: Id5d5c53b5d51b7c8984c93e8c89b0a71b8c660bd

diff --git a/uitest/Module_uitest.mk b/uitest/Module_uitest.mk
index 2530bee..ac5c322 100644
--- a/uitest/Module_uitest.mk
+++ b/uitest/Module_uitest.mk
@@ -13,4 +13,5 @@ $(eval $(call gb_Module_Module,uitest))
 $(eval $(call gb_Module_add_uicheck_targets,uitest,\
     UITest_calc_demo \
     UITest_writer_demo \
+    UITest_impress_demo \
 ))
diff --git a/uitest/UITest_impress_demo.mk b/uitest/UITest_impress_demo.mk
new file mode 100644
index 0000000..dfabbf9
--- /dev/null
+++ b/uitest/UITest_impress_demo.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,impress_demo))
+
+$(eval $(call gb_UITest_add_modules,impress_demo,$(SRCDIR)/uitest,\
+	impress_tests/impress_demo.txt \
+))
+# vim: set noet sw=4 ts=4:
diff --git a/uitest/impress_tests/impress_demo.txt b/uitest/impress_tests/impress_demo.txt
new file mode 100644
index 0000000..fb38b14
--- /dev/null
+++ b/uitest/impress_tests/impress_demo.txt
@@ -0,0 +1,4 @@
+impress_tests.start.start_impress
+impress_tests.start.select_page
+impress_tests.start.select_text
+impress_tests.start.select_object
commit 2df3910714451ae66a6693f6f17e11f1c8e7bdd4
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jun 18 19:31:39 2016 +0200

    uitest: reduce the sleeps
    
    The sleeps are not necessary but make it easier to see what is going on
    in the demo if you run it manually. In the uicheck case they are useless
    and just make the test take longer.
    
    Change-Id: I8d6d5a4fb1b068112e7785253bff936e198a7c97

diff --git a/uitest/impress_tests/start.py b/uitest/impress_tests/start.py
index c817cfe..5b0dfdb 100644
--- a/uitest/impress_tests/start.py
+++ b/uitest/impress_tests/start.py
@@ -38,7 +38,7 @@ def start_impress(xContext):
 
     print(xEditWin.getChildren())
 
-    time.sleep(5)
+    time.sleep(1)
 
     ui_test.close_doc()
 
@@ -56,12 +56,12 @@ def select_page(xContext):
 
     xEditWin = xImpressDoc.getChild("impress_win")
 
-    time.sleep(10)
+    time.sleep(1)
     print(get_state_as_dict(xEditWin))
 
     xEditWin.executeAction("GOTO", mkPropertyValues({"PAGE": "2"}))
 
-    time.sleep(5)
+    time.sleep(1)
 
     print(get_state_as_dict(xEditWin))
 
@@ -81,7 +81,7 @@ def select_text(xContext):
 
     xEditWin = xImpressDoc.getChild("impress_win")
 
-    time.sleep(10)
+    time.sleep(1)
 
     print(get_state_as_dict(xEditWin))
 
@@ -102,10 +102,10 @@ def select_object(xContext):
     xEditWin = xImpressDoc.getChild("impress_win")
 
     xEditWin.executeAction("SELECT", mkPropertyValues({"OBJECT":"Unnamed Drawinglayer object 1"}))
-    time.sleep(2)
+    time.sleep(1)
     xEditWin.executeAction("DESELECT", tuple())
 
-    time.sleep(4)
+    time.sleep(1)
 
     print(get_state_as_dict(xEditWin))
 
commit 665231b76ba3ffa574576ce4509e47a6863c20a5
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Jun 18 17:25:04 2016 +0200

    plugin:defaultparams
    
    Change-Id: Ibeec35b72e6dc81c72a9120ed14ae165e6137d26

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index c86de38..fae4c6a 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1208,7 +1208,7 @@ void OutputDevice::DrawTransformedBitmapEx(
         DrawBitmapEx(aDestPt, aDestSize, rBitmapEx);
         if (comphelper::LibreOfficeKit::isActive())
         {
-            EnableMapMode(true);
+            EnableMapMode();
             aDestPt.Move(-aOrigin.getX(), -aOrigin.getY());
         }
         return;