diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-09-07 21:26:02 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-07 21:44:57 +0200 |
| commit | 01b0d6da7ffdbd0eeea601020329c82fa1b37c11 (patch) | |
| tree | 859274a562f3afdd43271a7804c3880f99b9a969 /sw/qa | |
| parent | 01cc6e5107c706760939c2331ca57247bd02cb77 (diff) | |
unotest.py: refactor confusing mess of openDoc functions
Change-Id: I148332c639510c55dea2d09bc7aa695708fbf34c
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/python/check_cross_references.py | 2 | ||||
| -rw-r--r-- | sw/qa/python/check_fields.py | 2 | ||||
| -rw-r--r-- | sw/qa/python/check_flies.py | 2 | ||||
| -rw-r--r-- | sw/qa/python/text_portion_enumeration_test.py | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sw/qa/python/check_cross_references.py b/sw/qa/python/check_cross_references.py index 2246118bed31..9eaabf0b0105 100644 --- a/sw/qa/python/check_cross_references.py +++ b/sw/qa/python/check_cross_references.py @@ -38,7 +38,7 @@ class CheckCrossReferences(unittest.TestCase): def setUpClass(cls): cls._uno = UnoInProcess() cls._uno.setUp() - cls.document = cls._uno.openWriterTemplateDoc("CheckCrossReferences.odt") + cls.document = cls._uno.openDocFromTDOC("CheckCrossReferences.odt") cls.xParaEnum = None cls.xPortionEnum = None cls.xFieldsRefresh = None diff --git a/sw/qa/python/check_fields.py b/sw/qa/python/check_fields.py index ff02ec0eb9d5..2fdbdf93cc2c 100644 --- a/sw/qa/python/check_fields.py +++ b/sw/qa/python/check_fields.py @@ -17,7 +17,7 @@ class CheckFields(unittest.TestCase): def setUpClass(cls): cls._uno = UnoInProcess() cls._uno.setUp() - cls._xDoc = cls._uno.openWriterTemplateDoc("fdo39694.ott") + cls._xDoc = cls._uno.openTemplateFromTDOC("fdo39694.ott") cls._xEmptyDoc = cls._uno.openEmptyWriterDoc() @classmethod diff --git a/sw/qa/python/check_flies.py b/sw/qa/python/check_flies.py index 55c04fec0783..d9407731e609 100644 --- a/sw/qa/python/check_flies.py +++ b/sw/qa/python/check_flies.py @@ -26,7 +26,7 @@ class CheckFlies(unittest.TestCase): def setUpClass(cls): cls._uno = UnoInProcess() cls._uno.setUp() - cls.document = cls._uno.openWriterTemplateDoc("CheckFlies.odt") + cls.document = cls._uno.openDocFromTDOC("CheckFlies.odt") @classmethod def tearDownClass(cls): diff --git a/sw/qa/python/text_portion_enumeration_test.py b/sw/qa/python/text_portion_enumeration_test.py index b767368d850b..d6774629f96a 100644 --- a/sw/qa/python/text_portion_enumeration_test.py +++ b/sw/qa/python/text_portion_enumeration_test.py @@ -3250,7 +3250,7 @@ class TextPortionEnumerationTest(unittest.TestCase): def doload(self, file): xComp = None print("Loading test document...") - xComp = self.__class__._uno.openDoc(file) + xComp = self.__class__._uno.openDocFromAbsolutePath(file) self.assertIsNotNone(xComp, "cannot load: {}".format(file)) print("...done") return xComp @@ -3266,7 +3266,7 @@ class TextPortionEnumerationTest(unittest.TestCase): xComp = None filename = "TESTMETA.odt" try: - xComp = self.__class__._uno.openBaseDoc(filename) + xComp = self.__class__._uno.openDocFromTDOC(filename) if xComp: self.checkloadmeta(xComp) with TemporaryDirectory() as tempdir: @@ -3338,7 +3338,7 @@ class TextPortionEnumerationTest(unittest.TestCase): xComp = None filename = "TESTXMLID.odt" try: - xComp = self.__class__._uno.openBaseDoc(filename) + xComp = self.__class__._uno.openDocFromTDOC(filename) if xComp: self.checkloadxmlid(xComp) with TemporaryDirectory() as tempdir: |