mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix check_flies.py to be more pythonic

Browse Source 
Change-Id: Id5f44aaa97539b7ec97b81b39da30bd8d170c011
Reviewed-on: https://gerrit.libreoffice.org/33139
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
This commit is contained in:
Edmund Wong
2017-01-16 10:16:02 +08:00
committed by Björn Michaelsen
parent aa9251103a
commit 70b70d07ad
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sw/qa/python/check_flies.py
View File

@@ -16,18 +16,8 @@
the License at http://www.apache.org/licenses/LICENSE-2.0 . the License at http://www.apache.org/licenses/LICENSE-2.0 .
''' '''
from com.sun.star.lang import XMultiServiceFactory
from com.sun.star.text import XTextDocument
from com.sun.star.text import XTextFramesSupplier
from com.sun.star.text import XTextGraphicObjectsSupplier
from com.sun.star.text import XTextEmbeddedObjectsSupplier
from com.sun.star.container import XNameAccess
from com.sun.star.container import NoSuchElementException
from com.sun.star.container import XIndexAccess
from org.libreoffice.unotest import UnoInProcess from org.libreoffice.unotest import UnoInProcess
import unittest import unittest
import unohelper
import os
class CheckFlies(unittest.TestCase): class CheckFlies(unittest.TestCase):
@@ -65,11 +55,13 @@ class CheckFlies(unittest.TestCase):
self.assertTrue(xEmbeddedFrames.hasByName(sFrameName), self.assertTrue(xEmbeddedFrames.hasByName(sFrameName),
"Could not find embedded frame by name.") "Could not find embedded frame by name.")
self.assertTrue(not(vExpectedEmbeddedFrames), "Missing expected embedded frames.") self.assertTrue(not(vExpectedEmbeddedFrames),
"Missing expected embedded frames.")
xEmbeddedFramesIdx = xEmbeddedFrames xEmbeddedFramesIdx = xEmbeddedFrames
self.assertEqual(nEmbeddedFrames, len(xEmbeddedFramesIdx), "Unexpected number of embedded frames reported") self.assertEqual(nEmbeddedFrames, len(xEmbeddedFramesIdx),
"Unexpected number of embedded frames reported")
for nCurrentFrameIdx in range(len(xEmbeddedFramesIdx)): for nCurrentFrameIdx in range(len(xEmbeddedFramesIdx)):
xEmbeddedFramesIdx.getByIndex(nCurrentFrameIdx) xEmbeddedFramesIdx.getByIndex(nCurrentFrameIdx)
@@ -91,7 +83,8 @@ class CheckFlies(unittest.TestCase):
"Missing expected graphics frames.") "Missing expected graphics frames.")
xGraphicFramesIdx = xGraphicFrames xGraphicFramesIdx = xGraphicFrames
self.assertEqual(nGraphicFrames, len(xGraphicFramesIdx), "Unexpected number of graphics frames reported") self.assertEqual(nGraphicFrames, len(xGraphicFramesIdx),
"Unexpected number of graphics frames reported")
for nCurrentFrameIdx in range(len(xGraphicFramesIdx)): for nCurrentFrameIdx in range(len(xGraphicFramesIdx)):
xGraphicFramesIdx.getByIndex(nCurrentFrameIdx) xGraphicFramesIdx.getByIndex(nCurrentFrameIdx)
@@ -115,7 +108,8 @@ class CheckFlies(unittest.TestCase):
xTextFramesIdx = xTextFrames xTextFramesIdx = xTextFrames
self.assertEqual(nTextFrames, len(xTextFrames), "Unexpected number of text frames reported") self.assertEqual(nTextFrames, len(xTextFrames),
"Unexpected number of text frames reported")
for nCurrentFrameIdx in range(len(xTextFramesIdx)): for nCurrentFrameIdx in range(len(xTextFramesIdx)):
xTextFramesIdx.getByIndex(nCurrentFrameIdx) xTextFramesIdx.getByIndex(nCurrentFrameIdx)