[PATCH] clean up PythonTests

[David Ostrovsky (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3478

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/78/3478/1

clean up PythonTests

Change-Id: I8dc937df02efb686bf19d6606b9b42b6f0abf742
---
M sw/Module_sw.mk
R sw/PythonTest_sw_python.mk
M sw/qa/python/get_expression.py
M sw/qa/python/set_expression.py
M unotest/source/python/org/libreoffice/unotest.py
5 files changed, 23 insertions(+), 35 deletions(-)



diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index fedb44a..651ac52 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -72,7 +72,7 @@
 
 ifneq ($(DISABLE_PYTHON),TRUE)
 $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
-	PythonTest_sw_unoapi \
+	PythonTest_sw_python \
 ))
 endif
 
diff --git a/sw/PythonTest_sw_unoapi.mk b/sw/PythonTest_sw_python.mk
similarity index 81%
rename from sw/PythonTest_sw_unoapi.mk
rename to sw/PythonTest_sw_python.mk
index 20c6549..2b4132c 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 @@
     unoxml/source/service/unoxml \
 ))
 
-$(eval $(call gb_PythonTest_add_classes,sw_unoapi,\
+$(eval $(call gb_PythonTest_add_classes,sw_python,\
     $(SRCDIR)/sw/qa/python/set_expression.py \
     $(SRCDIR)/sw/qa/python/get_expression.py \
 ))
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,21 +32,11 @@
     # 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 @@
             finally:
                 self.connection = None
 
-class UnoNotConnection:
-    def __init__(self, args):
-        self.args = args
+class UnoInProcess:
     def getContext(self):
         return self.xContext
     def getDoc(self):

-- 
To view, visit https://gerrit.libreoffice.org/3478
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dc937df02efb686bf19d6606b9b42b6f0abf742
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky <David.Ostrovsky at gmx.de>