summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-06-26 03:26:22 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2016-06-26 03:28:10 +0200
commit6402c19c9b4d51dd7feaa3129b6f15b20704d356 (patch)
treefa28936e7f6736621cae531de6c9bc292ae28137
parent65979ca6ebf341a4733b2755d099e365e6dd0fa0 (diff)
uitest: move the EventListener to an own file in the new dir structure
Change-Id: I8d6c2d9f2a9386d8eec64780b7d197c9675764aa
-rw-r--r--uitest/helper.py38
-rw-r--r--uitest/libreoffice/uno/eventlistener.py50
-rw-r--r--uitest/uitest_helper.py2
3 files changed, 51 insertions, 39 deletions
diff --git a/uitest/helper.py b/uitest/helper.py
index b9930418e3ff..9b24bee10f22 100644
--- a/uitest/helper.py
+++ b/uitest/helper.py
@@ -18,44 +18,6 @@ except ImportError:
print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
raise
-try:
- from com.sun.star.document import XDocumentEventListener
-except ImportError:
- print("UNO API class not found: try to set URE_BOOTSTRAP variable")
- print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
- raise
-
-class EventListener(XDocumentEventListener,unohelper.Base):
-
- def __init__(self, xContext, eventNames):
- self.xGEB = xContext.ServiceManager.createInstanceWithContext(
- "com.sun.star.frame.GlobalEventBroadcaster", xContext)
- self.xContext = xContext
- self.executed = False
- self.eventExecuted = []
- if isinstance(eventNames, str):
- self.eventNames = [eventNames]
- elif isinstance(eventNames, list):
- self.eventNames = eventNames
-
- def __enter__(self):
- self.xGEB.addDocumentEventListener(self)
- return self
-
- def __exit__(self, type, value, traceback):
- self.xGEB.removeDocumentEventListener(self)
-
- def documentEventOccured(self, event):
- if event.EventName in self.eventNames:
- self.executed = True
- self.eventExecuted.append(event.EventName)
-
- def hasExecuted(self, eventName):
- return eventName in self.eventExecuted
-
- def disposing(event):
- pass
-
def mkPropertyValue(name, value):
""" Create a UNO ProertyValue from two input values.
"""
diff --git a/uitest/libreoffice/uno/eventlistener.py b/uitest/libreoffice/uno/eventlistener.py
new file mode 100644
index 000000000000..63eb0e60b53c
--- /dev/null
+++ b/uitest/libreoffice/uno/eventlistener.py
@@ -0,0 +1,50 @@
+# -*- Mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-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/.
+#
+
+try:
+ import pyuno
+ import uno
+ import unohelper
+ from com.sun.star.document import XDocumentEventListener
+except ImportError:
+ print("pyuno not found: try to set PYTHONPATH and URE_BOOTSTRAP variables")
+ print("PYTHONPATH=/installation/opt/program")
+ print("URE_BOOTSTRAP=file:///installation/opt/program/fundamentalrc")
+ raise
+
+class EventListener(XDocumentEventListener,unohelper.Base):
+
+ def __init__(self, xContext, eventNames):
+ self.xGEB = xContext.ServiceManager.createInstanceWithContext(
+ "com.sun.star.frame.GlobalEventBroadcaster", xContext)
+ self.xContext = xContext
+ self.executed = False
+ self.eventExecuted = []
+ if isinstance(eventNames, str):
+ self.eventNames = [eventNames]
+ elif isinstance(eventNames, list):
+ self.eventNames = eventNames
+
+ def __enter__(self):
+ self.xGEB.addDocumentEventListener(self)
+ return self
+
+ def __exit__(self, type, value, traceback):
+ self.xGEB.removeDocumentEventListener(self)
+
+ def documentEventOccured(self, event):
+ if event.EventName in self.eventNames:
+ self.executed = True
+ self.eventExecuted.append(event.EventName)
+
+ def hasExecuted(self, eventName):
+ return eventName in self.eventExecuted
+
+ def disposing(event):
+ pass
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uitest/uitest_helper.py b/uitest/uitest_helper.py
index 925010e7b19e..049929c8d024 100644
--- a/uitest/uitest_helper.py
+++ b/uitest/uitest_helper.py
@@ -7,7 +7,7 @@
import time
-from helper import EventListener
+from libreoffice.uno.eventlistener import EventListener
from helper import convert_property_values_to_dict