uitest/libreoffice/uno/eventlistener.py | 8 ++------
vcl/source/window/dialog.cxx | 3 +++
2 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 8093bd7017f2745d5048cdedcb9d61976bd3e69d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Mar 27 21:56:15 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Mar 28 06:43:54 2024 +0100
improve logging in UITests
(1) log useful stuff that is happening instead of logging events that
are __not__ interesting
(2) add the UIObject title to the event so we know who the event belongs
to
Change-Id: Iea4b70c03482b10731f186d730afa12dac760fa4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165435
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/uitest/libreoffice/uno/eventlistener.py
b/uitest/libreoffice/uno/eventlistener.py
index 54076efe337e..f7092836c935 100644
--- a/uitest/libreoffice/uno/eventlistener.py
+++ b/uitest/libreoffice/uno/eventlistener.py
@@ -36,15 +36,11 @@ class EventListener(XDocumentEventListener,unohelper.Base):
self.xGEB.removeDocumentEventListener(self)
def documentEventOccured(self, event):
- if self.printEvents is True:
- print(event.EventName)
-
+ print("documentEventOccured: name=" + event.EventName + ", title=" +
str(event.Supplement))
+ print("documentEventOccured: found event we are waiting for")
if event.EventName in self.eventNames:
self.executed = True
self.eventExecuted.append(event.EventName)
- else:
- print(self.eventNames)
- print(event.EventName)
def hasExecuted(self, eventName):
return eventName in self.eventExecuted
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index b60a96e06440..1ba812c94197 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -632,6 +632,7 @@ void Dialog::dispose()
css::uno::Reference<css::frame::XGlobalEventBroadcaster>
xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext),
css::uno::UNO_SET_THROW);
css::document::DocumentEvent aObject;
aObject.EventName = "DialogClosed";
+ aObject.Supplement <<= GetText(); // title
xEventBroadcaster->documentEventOccured(aObject);
UITestLogger::getInstance().log(u"Close Dialog");
@@ -1029,6 +1030,7 @@ bool Dialog::ImplStartExecute()
css::frame::theGlobalEventBroadcaster::get(xContext),
css::uno::UNO_SET_THROW);
css::document::DocumentEvent aObject;
aObject.EventName = "DialogExecute";
+ aObject.Supplement <<= GetText(); // title
xEventBroadcaster->documentEventOccured(aObject);
if (bModal)
UITestLogger::getInstance().log(Concat2View("Open Modal " + get_id()));
@@ -1651,6 +1653,7 @@ void Dialog::Activate()
css::uno::Reference<css::frame::XGlobalEventBroadcaster>
xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext),
css::uno::UNO_SET_THROW);
css::document::DocumentEvent aObject;
aObject.EventName = "ModelessDialogVisible";
+ aObject.Supplement <<= GetText(); // title
xEventBroadcaster->documentEventOccured(aObject);
}
SystemWindow::Activate();
