mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up PythonTests

Browse Source 
Conflicts:
	sw/PythonTest_sw_python.mk

Change-Id: I8dc937df02efb686bf19d6606b9b42b6f0abf742
This commit is contained in:
David Ostrovsky
2013-04-19 10:17:41 +02:00
committed by Michael Stahl
parent c8da8f4841
commit f21d1faf6d
5 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sw/Module_sw.mk
View File

@@ -73,7 +73,7 @@ endif
ifneq ($(DISABLE_PYTHON),TRUE) ifneq ($(DISABLE_PYTHON),TRUE)
ifneq ($(OS),WNT) ifneq ($(OS),WNT)
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
PythonTest_sw_unoapi \ PythonTest_sw_python \
)) ))
endif endif
endif endif

12
sw/PythonTest_sw_unoapi.mk → sw/PythonTest_sw_python.mk
View File

@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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 \ basic/util/sb \
comphelper/util/comphelp \ comphelper/util/comphelp \
configmgr/source/configmgr \ configmgr/source/configmgr \
@@ -48,7 +48,7 @@ $(eval $(call gb_PythonTest_use_components,sw_unoapi,\
unoxml/source/service/unoxml \ 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 \ set_expression \
get_expression \ get_expression \
)) ))

26
sw/qa/python/get_expression.py
View File

@@ -1,22 +1,22 @@
import unittest import unittest
from org.libreoffice.unotest import UnoNotConnection as UnoConnection from org.libreoffice.unotest import UnoInProcess
class TestGetExpression(unittest.TestCase): class TestGetExpression(unittest.TestCase):
_unoCon = None _uno = None
_xDoc = None _xDoc = None
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._unoCon = UnoConnection({}) cls._uno = UnoInProcess()
cls._unoCon.setUp() cls._uno.setUp()
cls._xDoc = cls._unoCon.openEmptyWriterDoc() cls._xDoc = cls._uno.openEmptyWriterDoc()
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
cls._unoCon.tearDown() cls._uno.tearDown()
def test_get_expression(self): def test_get_expression(self):
self.__class__._unoCon.checkProperties( self.__class__._uno.checkProperties(
self.__class__._xDoc.createInstance("com.sun.star.text.textfield.GetExpression"), self.__class__._xDoc.createInstance("com.sun.star.text.textfield.GetExpression"),
{"Content": "foo", {"Content": "foo",
"CurrentPresentation": "bar", "CurrentPresentation": "bar",
@@ -32,22 +32,12 @@ class TestGetExpression(unittest.TestCase):
# property 'Value' is read only? # property 'Value' is read only?
@unittest.expectedFailure @unittest.expectedFailure
def test_get_expression_veto_read_only(self): 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"), self.__class__._xDoc.createInstance("com.sun.star.text.textfield.GetExpression"),
{"Value": 0.0}, {"Value": 0.0},
self 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__': if __name__ == '__main__':
unittest.main() unittest.main()

14
sw/qa/python/set_expression.py
View File

@@ -1,23 +1,23 @@
import unittest import unittest
from org.libreoffice.unotest import UnoNotConnection as UnoConnection from org.libreoffice.unotest import UnoInProcess
#@unittest.skip("that seems to work") #@unittest.skip("that seems to work")
class TestSetExpresion(unittest.TestCase): class TestSetExpresion(unittest.TestCase):
_unoCon = None _uno = None
_xDoc = None _xDoc = None
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
cls._unoCon = UnoConnection({}) cls._uno = UnoInProcess()
cls._unoCon.setUp() cls._uno.setUp()
cls._xDoc = cls._unoCon.openEmptyWriterDoc() cls._xDoc = cls._uno.openEmptyWriterDoc()
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
cls._unoCon.tearDown() cls._uno.tearDown()
def test_set_expression(self): def test_set_expression(self):
self.__class__._unoCon.checkProperties( self.__class__._uno.checkProperties(
self.__class__._xDoc.createInstance("com.sun.star.text.textfield.SetExpression"), self.__class__._xDoc.createInstance("com.sun.star.text.textfield.SetExpression"),
{"NumberingType": 0, {"NumberingType": 0,
"Content": "foo", "Content": "foo",

4
unotest/source/python/org/libreoffice/unotest.py
View File

@@ -161,9 +161,7 @@ class UnoConnection:
finally: finally:
self.connection = None self.connection = None
class UnoNotConnection: class UnoInProcess:
def __init__(self, args):
self.args = args
def getContext(self): def getContext(self):
return self.xContext return self.xContext
def getDoc(self): def getDoc(self):