diff options
| -rw-r--r-- | sw/Module_sw.mk | 2 | ||||
| -rw-r--r-- | sw/PythonTest_sw_python.mk (renamed from sw/PythonTest_sw_unoapi.mk) | 12 | ||||
| -rw-r--r-- | sw/qa/python/get_expression.py | 26 | ||||
| -rw-r--r-- | sw/qa/python/set_expression.py | 14 | ||||
| -rw-r--r-- | unotest/source/python/org/libreoffice/unotest.py | 4 |
5 files changed, 23 insertions, 35 deletions
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk index 164e69047b5d..021fda84d4dc 100644 --- a/sw/Module_sw.mk +++ b/sw/Module_sw.mk @@ -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 diff --git a/sw/PythonTest_sw_unoapi.mk b/sw/PythonTest_sw_python.mk index a78f1c588c3b..09a48a964d6c 100644 --- a/sw/PythonTest_sw_unoapi.mk +++ b/sw/PythonTest_sw_python.mk @@ -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 \ )) diff --git a/sw/qa/python/get_expression.py b/sw/qa/python/get_expression.py index 5ac49f88fc34..089aa2d08524 100644 --- a/sw/qa/python/get_expression.py +++ b/sw/qa/python/get_expression.py @@ -1,22 +1,22 @@ 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() diff --git a/sw/qa/python/set_expression.py b/sw/qa/python/set_expression.py index d88d2f384ef0..6a24ff7b0b90 100644 --- a/sw/qa/python/set_expression.py +++ b/sw/qa/python/set_expression.py @@ -1,23 +1,23 @@ 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", diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py index 1f5f7d1c4202..a135baa9acb5 100644 --- a/unotest/source/python/org/libreoffice/unotest.py +++ b/unotest/source/python/org/libreoffice/unotest.py @@ -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): |