[Libreoffice-commits] core.git: sw/Module_sw.mk sw/PythonTest_sw_python.mk sw/PythonTest_sw_unoapi.mk sw/qa unotest/source
David Ostrovsky
david at ostrovsky.org
Mon Apr 22 09:24:51 PDT 2013
sw/Module_sw.mk | 2
sw/PythonTest_sw_python.mk | 56 +++++++++++++++++++++++
sw/PythonTest_sw_unoapi.mk | 56 -----------------------
sw/qa/python/get_expression.py | 26 +++-------
sw/qa/python/set_expression.py | 14 ++---
unotest/source/python/org/libreoffice/unotest.py | 4 -
6 files changed, 73 insertions(+), 85 deletions(-)
New commits:
commit f21d1faf6d5a8d9df84b48becbc137175d56ad79
Author: David Ostrovsky <david at ostrovsky.org>
Date: Fri Apr 19 10:17:41 2013 +0200
clean up PythonTests
Conflicts:
sw/PythonTest_sw_python.mk
Change-Id: I8dc937df02efb686bf19d6606b9b42b6f0abf742
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 164e690..021fda8 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
similarity index 80%
rename from sw/PythonTest_sw_unoapi.mk
rename to sw/PythonTest_sw_python.mk
index a78f1c5..09a48a9 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 5ac49f8..089aa2d 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 d88d2f3..6a24ff7 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 1f5f7d1..a135baa 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):
More information about the Libreoffice-commits
mailing list