[Libreoffice-commits] core.git: sc/CppunitTest_sc_perfobj.mk sc/Module_sc.mk sc/qa
Laurent Godard
lgodard.libre at laposte.net
Thu Nov 13 05:42:27 PST 2014
sc/CppunitTest_sc_perfobj.mk | 77 +++++++++
sc/Module_sc.mk | 4
sc/qa/perf/scperfobj.cxx | 255 +++++++++++++++++++++++++++++++++
sc/qa/perf/testdocuments/scBigFile.ods |binary
4 files changed, 335 insertions(+), 1 deletion(-)
New commits:
commit 4ef9e07c6526ac2e36f9d10a81da264f0b205920
Author: Laurent Godard <lgodard.libre at laposte.net>
Date: Mon Nov 3 16:01:07 2014 +0100
calc performance test
- a plain perfcheck test example on big file
- searches
- named ranges
- sheets
- big file is approx.
- 100 sheets
- 60k values in a sheets
- 5k named ranges
- 2k formulas (calling named ranges)
Change-Id: I61970f3387d400ed6737a369ead6daf896afacdc
diff --git a/sc/CppunitTest_sc_perfobj.mk b/sc/CppunitTest_sc_perfobj.mk
new file mode 100644
index 0000000..decabe0
--- /dev/null
+++ b/sc/CppunitTest_sc_perfobj.mk
@@ -0,0 +1,77 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# 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/.
+#
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_perfobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_perfobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_perfobj, \
+ sc/qa/perf/scperfobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_perfobj, \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ for \
+ forui \
+ i18nlangtag \
+ msfilter \
+ oox \
+ sal \
+ salhelper \
+ sax \
+ sb \
+ sc \
+ sfx \
+ sot \
+ subsequenttest \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ test \
+ tk \
+ tl \
+ ucbhelper \
+ unotest \
+ utl \
+ vbahelper \
+ vcl \
+ xo \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_perfobj,\
+ -I$(SRCDIR)/sc/source/ui/inc \
+ -I$(SRCDIR)/sc/inc \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sc_perfobj,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_perfobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_perfobj))
+
+
+$(eval $(call gb_CppunitTest_use_rdb,sc_perfobj,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_perfobj))
+
+$(eval $(call gb_CppunitTest_use_unittest_configuration,sc_perfobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 3f57318..9385dc5 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -85,7 +85,9 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
))
$(eval $(call gb_Module_add_perfcheck_targets,sc,\
- CppunitTest_sc_tablesheetobj \
+ CppunitTest_sc_perfobj \
+ CppunitTest_sc_tablesheetobj \
))
+
# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/perf/scperfobj.cxx b/sc/qa/perf/scperfobj.cxx
new file mode 100644
index 0000000..b30a2c2
--- /dev/null
+++ b/sc/qa/perf/scperfobj.cxx
@@ -0,0 +1,255 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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/.
+ */
+
+#include <test/calc_unoapi_test.hxx>
+
+#include <rtl/ustring.hxx>
+#include "cppunit/extensions/HelperMacros.h"
+
+#include <com/sun/star/util/XSearchable.hpp>
+#include <com/sun/star/util/XSearchDescriptor.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+#include <com/sun/star/sheet/XSpreadsheet.hpp>
+#include <com/sun/star/sheet/XSpreadsheets.hpp>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/table/XCellRange.hpp>
+#include <com/sun/star/sheet/XCellRangeAddressable.hpp>
+#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
+#include <com/sun/star/sheet/XNamedRanges.hpp>
+#include <com/sun/star/sheet/XNamedRange.hpp>
+#include <com/sun/star/table/XCell.hpp>
+#include <com/sun/star/text/XTextRange.hpp>
+#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/table/CellRangeAddress.hpp>
+#include <com/sun/star/sheet/Border.hpp>
+#include <com/sun/star/sheet/NamedRangeFlag.hpp>
+
+#include <test/callgrind.hxx>
+
+using namespace css;
+using namespace css::uno;
+
+namespace sc_apitest {
+
+#define NUMBER_OF_TESTS 3
+
+class ScPerfObj : public CalcUnoApiTest
+{
+public:
+
+ ScPerfObj();
+
+ virtual void setUp() SAL_OVERRIDE;
+ virtual void tearDown() SAL_OVERRIDE;
+
+ uno::Reference< uno::XInterface > init();
+
+ CPPUNIT_TEST_SUITE(ScPerfObj);
+ CPPUNIT_TEST(testSheetFindAll);
+ CPPUNIT_TEST(testSheetNamedRanges);
+ CPPUNIT_TEST(testSheets);
+ CPPUNIT_TEST_SUITE_END();
+
+private:
+
+ static sal_Int32 nTest;
+ static uno::Reference< lang::XComponent > mxComponent;
+
+ // tests
+ void testSheetFindAll();
+ void testSheetNamedRanges();
+ void testSheets();
+
+};
+
+sal_Int32 ScPerfObj::nTest = 0;
+uno::Reference< lang::XComponent > ScPerfObj::mxComponent;
+
+ScPerfObj::ScPerfObj()
+ : CalcUnoApiTest("sc/qa/perf/testdocuments/")
+{
+}
+
+uno::Reference< uno::XInterface > ScPerfObj::init()
+{
+ if (mxComponent.is())
+ closeDocument(mxComponent);
+
+ OUString aFileURL;
+ createFileURL(OUString("scBigFile.ods"), aFileURL);
+
+ mxComponent = loadFromDesktop(aFileURL);
+
+ CPPUNIT_ASSERT(mxComponent.is());
+
+ return mxComponent;
+}
+
+void ScPerfObj::setUp()
+{
+ nTest++;
+ CalcUnoApiTest::setUp();
+}
+
+void ScPerfObj::tearDown()
+{
+ if (nTest == NUMBER_OF_TESTS)
+ {
+ if (mxComponent.is())
+ {
+ closeDocument(mxComponent);
+ mxComponent.clear();
+ }
+ }
+ CalcUnoApiTest::tearDown();
+}
+
+void ScPerfObj::testSheetFindAll()
+{
+
+ uno::Reference< sheet::XSpreadsheetDocument > xDoc(init(), UNO_QUERY_THROW);
+
+ CPPUNIT_ASSERT_MESSAGE("Problem in document loading" , xDoc.is());
+
+ // get sheet
+ uno::Reference< container::XIndexAccess > xSheetIndex (xDoc->getSheets(), UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_MESSAGE("Problem in xSheetIndex" , xSheetIndex.is());
+
+ uno::Reference< sheet::XSpreadsheet > xSheet( xSheetIndex->getByIndex(0), UNO_QUERY_THROW);
+
+ // create descriptor
+ uno::Reference< util::XSearchable > xSearchable(xSheet, UNO_QUERY_THROW);
+ uno::Reference< util::XSearchDescriptor> xSearchDescr = xSearchable->createSearchDescriptor();
+
+ // search for a value
+ xSearchDescr->setSearchString(OUString("value_1"));
+
+ callgrindStart();
+
+ uno::Reference< container::XIndexAccess > xIndex = xSearchable->findAll(xSearchDescr);
+
+ callgrindDump("testSheetFindAll-Search value");
+
+ CPPUNIT_ASSERT(xIndex.is());
+
+ int nCount = xIndex->getCount();
+
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong Count" , 20000, nCount);
+
+ // search for style
+ uno::Reference< sheet::XSpreadsheet > xSheet2( xSheetIndex->getByIndex(2), UNO_QUERY_THROW);
+ uno::Reference< util::XSearchable > xSearchableStyle(xSheet2, UNO_QUERY_THROW);
+ xSearchDescr = xSearchableStyle->createSearchDescriptor();
+
+ uno::Reference< beans::XPropertySet > xSearchProp(xSearchDescr,UNO_QUERY_THROW);
+ xSearchProp->setPropertyValue(OUString("SearchStyles"), makeAny(true));
+
+ xSearchDescr->setSearchString(OUString("aCellStyle"));
+
+ callgrindStart();
+
+ uno::Reference< container::XIndexAccess > xIndex2 = xSearchableStyle->findAll(xSearchDescr);
+
+ callgrindDump("testSheetFindAll-Search style");
+
+ CPPUNIT_ASSERT(xIndex2.is());
+
+ nCount = xIndex2->getCount();
+
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong Count" , 160, nCount);
+
+}
+
+void ScPerfObj::testSheetNamedRanges()
+{
+
+ uno::Reference< lang::XComponent > xComponent (init(), UNO_QUERY_THROW);
+ uno::Reference< sheet::XSpreadsheetDocument > xDoc(xComponent, UNO_QUERY_THROW);
+
+ // get NamedRanges
+ uno::Reference< beans::XPropertySet > xPropSet (xComponent, UNO_QUERY_THROW);
+ OUString aNamedRangesPropertyString("NamedRanges");
+ uno::Reference< sheet::XNamedRanges > xNamedRanges(xPropSet->getPropertyValue(aNamedRangesPropertyString), UNO_QUERY_THROW);
+ uno::Reference< container::XIndexAccess > xIndexNamedRanges(xNamedRanges, UNO_QUERY_THROW);
+
+ // get sheet - named ranges are defined in sheet #1
+ uno::Reference< container::XIndexAccess > xSheetIndex (xDoc->getSheets(), UNO_QUERY_THROW);
+ CPPUNIT_ASSERT_MESSAGE("Problem in xSheetIndex" , xSheetIndex.is());
+ uno::Reference< sheet::XSpreadsheet > xSheet( xSheetIndex->getByIndex(1), UNO_QUERY_THROW);
+
+ // test removeByName
+ OUString maNameToRemove("namedRange_4999");
+ bool bHasIt = xNamedRanges->hasByName(maNameToRemove);
+ CPPUNIT_ASSERT_MESSAGE("NamedRange initial1 des not exits, can't remove it", bHasIt);
+
+ if (bHasIt)
+ {
+ callgrindStart();
+ xNamedRanges->removeByName(maNameToRemove);
+ callgrindDump("Namedranges-removeByName");
+ }
+
+ // test addNewByName
+ table::CellAddress aBaseAddress = table::CellAddress(0,0,0);
+
+ sal_Int32 nType = 0;
+ OUString aContent1("B4999");
+ OUString aName1("single_added");
+ callgrindStart();
+ xNamedRanges->addNewByName(aName1, aContent1, aBaseAddress, nType);
+ callgrindDump("Namedranges-addNewByName");
+
+ //test AddNewFromTitles with some 1000 new named ranges
+ table::CellRangeAddress aCellRangeAddress = table::CellRangeAddress(0,1,0,2,999);
+ callgrindStart();
+ xNamedRanges->addNewFromTitles(aCellRangeAddress, sheet::Border_LEFT);
+ callgrindDump("Namedranges-addNewFromTitles");
+
+}
+
+void ScPerfObj::testSheets()
+{
+
+ uno::Reference< sheet::XSpreadsheetDocument > xDoc(init(), UNO_QUERY_THROW);
+
+ CPPUNIT_ASSERT_MESSAGE("Problem in document loading" , xDoc.is());
+
+ // get getSheets
+ uno::Reference< sheet::XSpreadsheets > xSheets (xDoc->getSheets(), UNO_QUERY_THROW);
+
+ OUString aSheetName = "NewSheet";
+
+ callgrindStart();
+ xSheets->insertNewByName(aSheetName, 80);
+ callgrindDump("Sheets-insertNewByName");
+
+ OUString aSourceSheetName = "aSheet_2";
+ OUString aTargetSheetName = "aCopiedSheet";
+
+ callgrindStart();
+ xSheets->copyByName(aSourceSheetName, aTargetSheetName, 70);
+ callgrindDump("Sheets-copyByName");
+
+ uno::Reference< sheet::XSpreadsheets > xSheetsNameContainer (xSheets, UNO_QUERY_THROW);
+
+ callgrindStart();
+ xSheetsNameContainer->removeByName(aSheetName);
+ callgrindDump("Sheets-removeByName");
+
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(ScPerfObj);
+
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/perf/testdocuments/scBigFile.ods b/sc/qa/perf/testdocuments/scBigFile.ods
new file mode 100644
index 0000000..2a90c62
Binary files /dev/null and b/sc/qa/perf/testdocuments/scBigFile.ods differ
More information about the Libreoffice-commits
mailing list