clean up PythonTests

Conflicts:
sw/PythonTest_sw_python.mk

Change-Id: I8dc937df02efb686bf19d6606b9b42b6f0abf742

2 files changed, 15 insertions, 25 deletions

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",