Kaydet (Commit) f21d1faf authored tarafından David Ostrovsky's avatar David Ostrovsky Kaydeden (comit) Michael Stahl

clean up PythonTests

Conflicts:
	sw/PythonTest_sw_python.mk

Change-Id: I8dc937df02efb686bf19d6606b9b42b6f0abf742
üst c8da8f48
......@@ -73,7 +73,7 @@ endif
ifneq ($(DISABLE_PYTHON),TRUE)
ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
PythonTest_sw_unoapi \
PythonTest_sw_python \
))
endif
endif
......
......@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_PythonTest_PythonTest,sw_unoapi))
$(eval $(call gb_PythonTest_PythonTest,sw_python))
$(eval $(call gb_PythonTest_use_configuration,sw_unoapi))
$(eval $(call gb_PythonTest_use_configuration,sw_python))
$(eval $(call gb_PythonTest_use_api,sw_unoapi,offapi))
$(eval $(call gb_PythonTest_use_api,sw_python,offapi))
# FAIL: this brings in GconfBackend $(eval $(call gb_PythonTest_use_rdb,sw_unoapi,services))
# FAIL: this brings in GconfBackend $(eval $(call gb_PythonTest_use_rdb,sw_python,services))
$(eval $(call gb_PythonTest_use_components,sw_unoapi,\
$(eval $(call gb_PythonTest_use_components,sw_python,\
basic/util/sb \
comphelper/util/comphelp \
configmgr/source/configmgr \
......@@ -48,7 +48,7 @@ $(eval $(call gb_PythonTest_use_components,sw_unoapi,\
unoxml/source/service/unoxml \
))
$(eval $(call gb_PythonTest_add_modules,sw_unoapi,$(SRCDIR)/sw/qa/python,\
$(eval $(call gb_PythonTest_add_modules,sw_python,$(SRCDIR)/sw/qa/python,\
set_expression \
get_expression \
))
......
import unittest
from org.libreoffice.unotest import UnoNotConnection as UnoConnection
from org.libreoffice.unotest import UnoInProcess
class TestGetExpression(unittest.TestCase):
_unoCon = None
_uno = None
_xDoc = None
@classmethod
def setUpClass(cls):
cls._unoCon = UnoConnection({})
cls._unoCon.setUp()
cls._xDoc = cls._unoCon.openEmptyWriterDoc()
cls._uno = UnoInProcess()
cls._uno.setUp()
cls._xDoc = cls._uno.openEmptyWriterDoc()
@classmethod
def tearDownClass(cls):
cls._unoCon.tearDown()
cls._uno.tearDown()
def test_get_expression(self):
self.__class__._unoCon.checkProperties(
self.__class__._uno.checkProperties(
self.__class__._xDoc.createInstance("com.sun.star.text.textfield.GetExpression"),
{"Content": "foo",
"CurrentPresentation": "bar",
......@@ -32,22 +32,12 @@ class TestGetExpression(unittest.TestCase):
# property 'Value' is read only?
@unittest.expectedFailure
def test_get_expression_veto_read_only(self):
self.__class__._unoCon.checkProperties(
self.__class__._uno.checkProperties(
self.__class__._xDoc.createInstance("com.sun.star.text.textfield.GetExpression"),
{"Value": 0.0},
self
)
# property 'NumberingType' is unknown?
@unittest.expectedFailure
def test_get_expression_unknown_property(self):
self.__class__._unoCon.checkProperties(
self.__class__._xDoc.createInstance("com.sun.star.text.textfield.GetExpression"),
{"NumberingType": 0},
self
)
if __name__ == '__main__':
unittest.main()
import unittest
from org.libreoffice.unotest import UnoNotConnection as UnoConnection
from org.libreoffice.unotest import UnoInProcess
#@unittest.skip("that seems to work")
class TestSetExpresion(unittest.TestCase):
_unoCon = None
_uno = None
_xDoc = None
@classmethod
def setUpClass(cls):
cls._unoCon = UnoConnection({})
cls._unoCon.setUp()
cls._xDoc = cls._unoCon.openEmptyWriterDoc()
cls._uno = UnoInProcess()
cls._uno.setUp()
cls._xDoc = cls._uno.openEmptyWriterDoc()
@classmethod
def tearDownClass(cls):
cls._unoCon.tearDown()
cls._uno.tearDown()
def test_set_expression(self):
self.__class__._unoCon.checkProperties(
self.__class__._uno.checkProperties(
self.__class__._xDoc.createInstance("com.sun.star.text.textfield.SetExpression"),
{"NumberingType": 0,
"Content": "foo",
......
......@@ -161,9 +161,7 @@ class UnoConnection:
finally:
self.connection = None
class UnoNotConnection:
def __init__(self, args):
self.args = args
class UnoInProcess:
def getContext(self):
return self.xContext
def getDoc(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment