diff --git a/pyuno/qa/pytests/testcollections_XIndexContainer.py b/pyuno/qa/pytests/testcollections_XIndexContainer.py index 45cf509889a4..379d5328fdeb 100644 --- a/pyuno/qa/pytests/testcollections_XIndexContainer.py +++ b/pyuno/qa/pytests/testcollections_XIndexContainer.py @@ -30,7 +30,7 @@ class TestXIndexContainer(CollectionsTestBase): values = sm.createInstanceWithContext("com.sun.star.document.IndexedPropertyValues", self.context) for i in range(count): properties = (PropertyValue(Name='n'+str(i), Value='v'+str(i)),) - uno.invoke(values, "insertByIndex", (i, uno.Any("[]com.sun.star.beans.PropertyValue", properties))) + values.insertByIndex(i, uno.Any("[]com.sun.star.beans.PropertyValue", properties)) return values def generateTestTuple(self, values): diff --git a/pyuno/qa/pytests/testcollections_XIndexReplace.py b/pyuno/qa/pytests/testcollections_XIndexReplace.py index 0075883543d3..ddc93095c559 100644 --- a/pyuno/qa/pytests/testcollections_XIndexReplace.py +++ b/pyuno/qa/pytests/testcollections_XIndexReplace.py @@ -28,7 +28,7 @@ class TestXIndexReplace(CollectionsTestBase): index = getContentIndexInstance(doc) for i in range(10): styles = ('n'+str(i),) - uno.invoke(index.LevelParagraphStyles, "replaceByIndex", (i, uno.Any("[]string", styles))) + index.LevelParagraphStyles.replaceByIndex(i, uno.Any("[]string", styles)) return index def generateTestTuple(self, values): diff --git a/sw/qa/python/check_indexed_property_values.py b/sw/qa/python/check_indexed_property_values.py index d6d314adc894..300c41c1a52a 100644 --- a/sw/qa/python/check_indexed_property_values.py +++ b/sw/qa/python/check_indexed_property_values.py @@ -51,34 +51,34 @@ class CheckIndexedPropertyValues(unittest.TestCase): prop3 = uno.Any("[]com.sun.star.beans.PropertyValue", (p3,)) self.assertEqual(0, len(xCont), "Initial container is not empty") - uno.invoke(xCont, "insertByIndex", (0, prop1)) + xCont.insertByIndex(0, prop1) ret = xCont[0] self.assertEqual(p1.Name, ret[0].Name) self.assertEqual(p1.Value, ret[0].Value) - uno.invoke(xCont, "replaceByIndex", (0, prop2)) + xCont.replaceByIndex(0, prop2) ret = xCont[0] self.assertEqual(p2.Name, ret[0].Name) self.assertEqual(p2.Value, ret[0].Value) xCont.removeByIndex(0) self.assertTrue(not(xCont.hasElements()) and len(xCont) == 0, "Could not remove PropertyValue") - uno.invoke(xCont, "insertByIndex", (0, prop1)) - uno.invoke(xCont, "insertByIndex", (1, prop2)) + xCont.insertByIndex(0, prop1) + xCont.insertByIndex(1, prop2) self.assertTrue(xCont.hasElements() and len(xCont) == 2, "Did not insert PropertyValue") - uno.invoke(xCont, "insertByIndex", (1, prop2)) - uno.invoke(xCont, "insertByIndex", (1, prop3)) + xCont.insertByIndex(1, prop2) + xCont.insertByIndex(1, prop3) ret = xCont[1] self.assertEqual(p3.Name, ret[0].Name) self.assertEqual(p3.Value, ret[0].Value) with self.assertRaises(IndexOutOfBoundsException): - uno.invoke(xCont, "insertByIndex", (25, prop2)) + xCont.insertByIndex(25, prop2) with self.assertRaises(IndexOutOfBoundsException): xCont.removeByIndex(25) with self.assertRaises(IllegalArgumentException): - uno.invoke(xCont, "insertByIndex", (3, "Example String")) + xCont.insertByIndex(3, "Example String") diff --git a/sw/qa/python/check_named_property_values.py b/sw/qa/python/check_named_property_values.py index 39d4b33cacc9..ef72c6e44fe1 100644 --- a/sw/qa/python/check_named_property_values.py +++ b/sw/qa/python/check_named_property_values.py @@ -51,20 +51,20 @@ class CheckNamedPropertyValues(unittest.TestCase): self.assertFalse(xCont.hasElements(), "Initial container is not empty") - uno.invoke(xCont, "insertByName", ("prop1", prop1)) + xCont.insertByName("prop1", prop1) ret = xCont["prop1"] self.assertEqual(p1.Name, ret[0].Name) self.assertEqual(p1.Value, ret[0].Value) - uno.invoke(xCont, "replaceByName", ("prop1", prop2)) + xCont.replaceByName("prop1", prop2) ret = xCont["prop1"] self.assertEqual(p2.Name, ret[0].Name) self.assertEqual(p2.Value, ret[0].Value) xCont.removeByName("prop1") self.assertFalse(xCont.hasElements(), "Could not remove PropertyValue.") - uno.invoke(xCont, "insertByName", ("prop1", prop1)) - uno.invoke(xCont, "insertByName", ("prop2", prop2)) + xCont.insertByName("prop1", prop1) + xCont.insertByName("prop2", prop2) self.assertTrue(xCont.hasElements(), "Did not insert PropertyValue") names = xCont.getElementNames() self.assertEqual(2, len(names), "Not all element names were returned") @@ -73,10 +73,10 @@ class CheckNamedPropertyValues(unittest.TestCase): self.assertIn(names[i], ["prop1", "prop2"], "Got a wrong element name") with self.assertRaises(ElementExistException): - uno.invoke(xCont, "insertByName", ("prop2", prop1)) + xCont.insertByName("prop2", prop1) with self.assertRaises(IllegalArgumentException): - uno.invoke(xCont, "insertByName", ("prop3", "Example String")) + xCont.insertByName("prop3", "Example String") with self.assertRaises(NoSuchElementException): xCont.removeByName("prop3")