sw/PythonTest_sw_python.mk | 3 sw/qa/complex/writer/CheckFlies.java | 207 ----------------------------------- sw/qa/python/check_flies.py | 126 +++++++++++++++++++++ 3 files changed, 128 insertions(+), 208 deletions(-)
New commits: commit b71540c1980955b439d334c875f47d2ee44e4c5f Author: kadertarlan <kadertarl...@gmail.com> Date: Mon Dec 14 17:06:17 2015 +0200 Java unit tests were converted to Python unit tests Remark test document not moved, due to other test cases. Change-Id: I9564b72fae60cceb60121fec06e1ed015add8453 Reviewed-on: https://gerrit.libreoffice.org/20703 Reviewed-by: jan iversen <j...@documentfoundation.org> Tested-by: jan iversen <j...@documentfoundation.org> diff --git a/sw/PythonTest_sw_python.mk b/sw/PythonTest_sw_python.mk index 695bbf9..c24d418 100644 --- a/sw/PythonTest_sw_python.mk +++ b/sw/PythonTest_sw_python.mk @@ -15,7 +15,8 @@ $(eval $(call gb_PythonTest_set_defs,sw_python,\ $(eval $(call gb_PythonTest_add_modules,sw_python,$(SRCDIR)/sw/qa/python,\ check_index \ - check_fields \ + check_flies \ + check_fields \ check_styles \ check_table \ get_expression \ diff --git a/sw/qa/complex/writer/CheckFlies.java b/sw/qa/complex/writer/CheckFlies.java deleted file mode 100644 index 6682696..0000000 --- a/sw/qa/complex/writer/CheckFlies.java +++ /dev/null @@ -1,207 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -package complex.writer; - -import com.sun.star.lang.XMultiServiceFactory; -import com.sun.star.text.XTextDocument; -import com.sun.star.uno.UnoRuntime; -import java.util.Collection; -import java.util.ArrayList; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.openoffice.test.OfficeConnection; -import static org.junit.Assert.*; - -public class CheckFlies { - @Test public void checkFlies() - throws com.sun.star.uno.Exception - { - com.sun.star.text.XTextFramesSupplier xTFS = UnoRuntime.queryInterface( - com.sun.star.text.XTextFramesSupplier.class, - document); - checkTextFrames(xTFS); - com.sun.star.text.XTextGraphicObjectsSupplier xTGOS = UnoRuntime.queryInterface( - com.sun.star.text.XTextGraphicObjectsSupplier.class, - document); - checkGraphicFrames(xTGOS); - com.sun.star.text.XTextEmbeddedObjectsSupplier xTEOS = UnoRuntime.queryInterface( - com.sun.star.text.XTextEmbeddedObjectsSupplier.class, - document); - checkEmbeddedFrames(xTEOS); - } - - private void checkEmbeddedFrames(com.sun.star.text.XTextEmbeddedObjectsSupplier xTGOS) - throws com.sun.star.uno.Exception - { - Collection<String> vExpectedEmbeddedFrames = new ArrayList<String>(); - vExpectedEmbeddedFrames.add("Object1"); - int nEmbeddedFrames = vExpectedEmbeddedFrames.size(); - com.sun.star.container.XNameAccess xEmbeddedFrames = xTGOS.getEmbeddedObjects(); - for(String sFrameName : xEmbeddedFrames.getElementNames()) - { - assertTrue( - "Unexpected frame name", - vExpectedEmbeddedFrames.remove(sFrameName)); - xEmbeddedFrames.getByName(sFrameName); - assertTrue( - "Could not find embedded frame by name.", - xEmbeddedFrames.hasByName(sFrameName)); - } - assertTrue( - "Missing expected embedded frames.", - vExpectedEmbeddedFrames.isEmpty()); - try - { - xEmbeddedFrames.getByName("Nonexisting embedded frame"); - fail("Got nonexisting embedded frame"); - } - catch(com.sun.star.container.NoSuchElementException e) - {} - assertFalse( - "Has nonexisting embedded frame", - xEmbeddedFrames.hasByName("Nonexisting embedded frame")); - - com.sun.star.container.XIndexAccess xEmbeddedFramesIdx = UnoRuntime.queryInterface( - com.sun.star.container.XIndexAccess.class, - xEmbeddedFrames); - assertEquals( - "Unexpected number of embedded frames reported.", nEmbeddedFrames, - xEmbeddedFramesIdx.getCount()); - for(int nCurrentFrameIdx = 0; nCurrentFrameIdx < xEmbeddedFramesIdx.getCount(); nCurrentFrameIdx++) - { - xEmbeddedFramesIdx.getByIndex(nCurrentFrameIdx); - } - } - - private void checkGraphicFrames(com.sun.star.text.XTextGraphicObjectsSupplier xTGOS) - throws com.sun.star.uno.Exception - { - Collection<String> vExpectedGraphicFrames = new ArrayList<String>(); - vExpectedGraphicFrames.add("graphics1"); - int nGraphicFrames = vExpectedGraphicFrames.size(); - com.sun.star.container.XNameAccess xGraphicFrames = xTGOS.getGraphicObjects(); - for(String sFrameName : xGraphicFrames.getElementNames()) - { - assertTrue( - "Unexpected frame name", - vExpectedGraphicFrames.remove(sFrameName)); - xGraphicFrames.getByName(sFrameName); - assertTrue( - "Could not find graphics frame by name.", - xGraphicFrames.hasByName(sFrameName)); - } - assertTrue( - "Missing expected graphics frames.", - vExpectedGraphicFrames.isEmpty()); - try - { - xGraphicFrames.getByName("Nonexisting graphics frame"); - fail("Got nonexisting graphics frame"); - } - catch(com.sun.star.container.NoSuchElementException e) - {} - assertFalse( - "Has nonexisting graphics frame", - xGraphicFrames.hasByName("Nonexisting graphics frame")); - - com.sun.star.container.XIndexAccess xGraphicFramesIdx = UnoRuntime.queryInterface( - com.sun.star.container.XIndexAccess.class, - xGraphicFrames); - assertEquals( - "Unexpected number of graphics frames reported.", nGraphicFrames, - xGraphicFramesIdx.getCount()); - for(int nCurrentFrameIdx = 0; nCurrentFrameIdx < xGraphicFramesIdx.getCount(); nCurrentFrameIdx++) - { - xGraphicFramesIdx.getByIndex(nCurrentFrameIdx); - } - } - - private void checkTextFrames(com.sun.star.text.XTextFramesSupplier xTFS) - throws com.sun.star.uno.Exception - { - Collection<String> vExpectedTextFrames = new ArrayList<String>(); - vExpectedTextFrames.add("Frame1"); - vExpectedTextFrames.add("Frame2"); - - int nTextFrames = vExpectedTextFrames.size(); - com.sun.star.container.XNameAccess xTextFrames = xTFS.getTextFrames(); - for(String sFrameName : xTextFrames.getElementNames()) - { - assertTrue( - "Unexpected frame name", - vExpectedTextFrames.remove(sFrameName)); - xTextFrames.getByName(sFrameName); - assertTrue( - "Could not find text frame by name.", - xTextFrames.hasByName(sFrameName)); - } - assertTrue( - "Missing expected text frames.", vExpectedTextFrames.isEmpty()); - try - { - xTextFrames.getByName("Nonexisting Textframe"); - fail("Got nonexisting text frame."); - } - catch(com.sun.star.container.NoSuchElementException e) - {} - assertFalse( - "Has nonexisting text frame.", - xTextFrames.hasByName("Nonexisting text frame")); - - com.sun.star.container.XIndexAccess xTextFramesIdx = UnoRuntime.queryInterface( - com.sun.star.container.XIndexAccess.class, - xTextFrames); - assertEquals( - "Unexpected number of text frames reported.", nTextFrames, - xTextFramesIdx.getCount()); - for(int nCurrentFrameIdx = 0; nCurrentFrameIdx < xTextFramesIdx.getCount(); nCurrentFrameIdx++) - { - xTextFramesIdx.getByIndex(nCurrentFrameIdx); - } - } - - @Before public void setUpDocument() { - document = util.WriterTools.loadTextDoc( - UnoRuntime.queryInterface( - XMultiServiceFactory.class, - connection.getComponentContext().getServiceManager()), - TestDocument.getUrl("CheckFlies.odt")); - } - - @After public void tearDownDocument() { - util.DesktopTools.closeDoc(document); - } - - private XTextDocument document = null; - - @BeforeClass public static void setUpConnection() throws Exception { - connection.setUp(); - } - - @AfterClass public static void tearDownConnection() - throws InterruptedException, com.sun.star.uno.Exception - { - connection.tearDown(); - } - - private static final OfficeConnection connection = new OfficeConnection(); -} diff --git a/sw/qa/python/check_flies.py b/sw/qa/python/check_flies.py new file mode 100644 index 0000000..90293f9 --- /dev/null +++ b/sw/qa/python/check_flies.py @@ -0,0 +1,126 @@ +''' + This is file is part of the LibreOffice project. + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + + This file incorporates work covered by the following license notice: + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed + with this work for additional information regarding copyright + ownership. The ASF licenses this file to you under the Apache + License, Version 2.0 (the "License"); you may not use this file + except in compliance with the License. You may obtain a copy of + 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 +import unittest +import unohelper +import os + +class CheckFlies(unittest.TestCase): + + @classmethod + def setUpClass(cls): + cls._uno = UnoInProcess() + cls._uno.setUp() + cls.document = cls._uno.openWriterTemplateDoc("CheckFlies.odt") + + + @classmethod + def tearDownClass(cls): + cls._uno.tearDown() + + def test_checkFlies(self): + xTFS = self.__class__.document + self.checkTextFrames(xTFS) + xTGOS = self.__class__.document + self.checkGraphicFrames(xTGOS) + xTEOS = self.__class__.document + self.checkEmbeddedFrames(xTEOS) + + def checkEmbeddedFrames(self, xTGOS): + vExpectedEmbeddedFrames = ["Object1"] + nEmbeddedFrames = len(vExpectedEmbeddedFrames) + xEmbeddedFrames = xTGOS.getEmbeddedObjects() + nCurrentFrameIdx=0 + + print (xEmbeddedFrames) + for sFrameName in xEmbeddedFrames.getElementNames(): + self.assertTrue("Unexpected frame name", vExpectedEmbeddedFrames.remove(sFrameName)) + print (sFrameName) + xEmbeddedFrames.getByName(sFrameName) + self.assertTrue("Could not find embedded frame by name.", xEmbeddedFrames.hasByName(sFrameName)) + + self.assertTrue("Missing expected embedded frames.", not(vExpectedEmbeddedFrames)) + + xEmbeddedFramesIdx = xEmbeddedFrames + + self.assertEqual(nEmbeddedFrames, xEmbeddedFramesIdx.getCount()) #Unexpected number of embedded frames reported + + for nCurrentFrameIdx in range(xEmbeddedFramesIdx.getCount()): + xEmbeddedFramesIdx.getByIndex(nCurrentFrameIdx) + + def checkGraphicFrames(self, xTGOS): + vExpectedGraphicFrames = ["graphics1"] + nGraphicFrames = len(vExpectedGraphicFrames) + xGraphicFrames = xTGOS.getGraphicObjects() + nCurrentFrameIdx = 0 + for sFrameName in xGraphicFrames.getElementNames(): + self.assertTrue( + "Unexpected frame name", + vExpectedGraphicFrames.remove(sFrameName)) + xGraphicFrames.getByName(sFrameName) + self.assertTrue( + "Could not find graphics frame by name.", + xGraphicFrames.hasByName(sFrameName)) + self.assertTrue( + "Missing expected graphics frames.", + not(vExpectedGraphicFrames)) + + xGraphicFramesIdx = xGraphicFrames + self.assertEqual(nGraphicFrames,xGraphicFramesIdx.getCount()) #Unexpected number of graphics frames reported + + for nCurrentFrameIdx in range(xGraphicFramesIdx.getCount()): + xGraphicFramesIdx.getByIndex(nCurrentFrameIdx); + + def checkTextFrames(self, xTFS): + vExpectedTextFrames= ["Frame1" , "Frame2"] + nTextFrames = len(vExpectedTextFrames) + xTextFrames = xTFS.getTextFrames() + nCurrentFrameIdx=0 + + for sFrameName in xTextFrames.getElementNames(): + self.assertTrue( + "Unexpected frame name", + vExpectedTextFrames.remove(sFrameName)) + xTextFrames.getByName(sFrameName) + self.assertTrue( + "Could not find text frame by name.", + xTextFrames.hasByName(sFrameName)) + + self.assertTrue( + "Missing expected text frames.", not(vExpectedTextFrames)) + + xTextFramesIdx = xTextFrames + + self.assertEqual(nTextFrames, xTextFrames.getCount()) #Unexpected number of text frames reported + + for nCurrentFrameIdx in range(xTextFramesIdx.getCount()): + xTextFramesIdx.getByIndex(nCurrentFrameIdx) + + +if __name__ == "__main__": + unittest.main() + _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits