[Libreoffice-commits] core.git: sc/CppunitTest_sc_condformats.mk sc/Module_sc.mk sc/qa
Jens Carl
j.carl43 at gmx.de
Fri Nov 10 03:33:00 UTC 2017
sc/CppunitTest_sc_condformats.mk | 106 -------------------------------
sc/Module_sc.mk | 1
sc/qa/extras/sccondformats.cxx | 130 ---------------------------------------
3 files changed, 237 deletions(-)
New commits:
commit d31fdb27583f5f594e8424bf061a74fde5cf2704
Author: Jens Carl <j.carl43 at gmx.de>
Date: Thu Nov 2 00:19:40 2017 +0000
Remove obsolete sc_condformats unit test
Remove the special snowflake sc_condformats because it's
now covert by xsheetconditionalentries (see commit
44e9640748791f602edb22cbc499200283466e1e).
Change-Id: Ibdae392533605b56cf9b9c28f8c419ea0d32c0d8
Reviewed-on: https://gerrit.libreoffice.org/44523
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Jens Carl <j.carl43 at gmx.de>
diff --git a/sc/CppunitTest_sc_condformats.mk b/sc/CppunitTest_sc_condformats.mk
deleted file mode 100644
index f88d6b264674..000000000000
--- a/sc/CppunitTest_sc_condformats.mk
+++ /dev/null
@@ -1,106 +0,0 @@
-# -*- 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_condformats))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_condformats, \
- sc/qa/extras/sccondformats \
-))
-
-$(eval $(call gb_CppunitTest_use_external,sc_condformats,boost_headers))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_condformats, \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- drawinglayer \
- editeng \
- for \
- forui \
- i18nlangtag \
- msfilter \
- oox \
- sal \
- salhelper \
- sax \
- sb \
- sc \
- scqahelper \
- sfx \
- sot \
- subsequenttest \
- svl \
- svt \
- svx \
- svxcore \
- test \
- tk \
- tl \
- ucbhelper \
- unotest \
- utl \
- vbahelper \
- vcl \
- xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_condformats,\
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_condformats))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_condformats))
-$(eval $(call gb_CppunitTest_use_vcl,sc_condformats))
-
-$(eval $(call gb_CppunitTest_use_components,sc_condformats,\
- basic/util/sb \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- dbaccess/util/dba \
- filter/source/config/cache/filterconfig1 \
- filter/source/storagefilterdetect/storagefd \
- forms/util/frm \
- framework/util/fwk \
- i18npool/util/i18npool \
- linguistic/source/lng \
- oox/util/oox \
- package/source/xstor/xstor \
- package/util/package2 \
- sax/source/expatwrap/expwrap \
- scripting/source/basprov/basprov \
- scripting/util/scriptframe \
- sc/util/sc \
- sc/util/scd \
- sc/util/scfilt \
- $(call gb_Helper_optional,SCRIPTING, \
- sc/util/vbaobj) \
- sfx2/util/sfx \
- sot/util/sot \
- svl/source/fsstor/fsstorage \
- toolkit/util/tk \
- ucb/source/core/ucb1 \
- ucb/source/ucp/file/ucpfile1 \
- ucb/source/ucp/tdoc/ucptdoc1 \
- unotools/util/utl \
- unoxml/source/rdf/unordf \
- unoxml/source/service/unoxml \
- uui/util/uui \
- xmloff/util/xo \
- svtools/util/svt \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_condformats))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index fab66a9a48c7..1879ca435abf 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -57,7 +57,6 @@ endif
endif
$(eval $(call gb_Module_add_slowcheck_targets,sc, \
- CppunitTest_sc_condformats \
CppunitTest_sc_new_cond_format_api \
CppunitTest_sc_subsequent_filters_test \
CppunitTest_sc_subsequent_export_test \
diff --git a/sc/qa/extras/sccondformats.cxx b/sc/qa/extras/sccondformats.cxx
deleted file mode 100644
index 9aad32ba6f06..000000000000
--- a/sc/qa/extras/sccondformats.cxx
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- 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 <svx/svdograf.hxx>
-#include <svx/svdpage.hxx>
-#include <sfx2/dispatch.hxx>
-
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sheet/ConditionOperator.hpp>
-#include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/table/CellAddress.hpp>
-#include <unonames.hxx>
-
-#include <tabvwsh.hxx>
-#include <docsh.hxx>
-
-#include <sc.hrc>
-
-using namespace css;
-
-namespace sc_apitest {
-
-class ScConditionalFormatTest : public CalcUnoApiTest
-{
-public:
- ScConditionalFormatTest();
-
- virtual void tearDown() override;
-
- uno::Reference< uno::XInterface > init();
- void testCondFormat();
-
- CPPUNIT_TEST_SUITE(ScConditionalFormatTest);
- CPPUNIT_TEST(testCondFormat);
- CPPUNIT_TEST_SUITE_END();
-private:
-
- uno::Reference< lang::XComponent > mxComponent;
-};
-
-ScConditionalFormatTest::ScConditionalFormatTest()
- : CalcUnoApiTest("sc/qa/unit/data/ods")
-{
-}
-
-uno::Reference< uno::XInterface > ScConditionalFormatTest::init()
-{
- // get the test file
- OUString aFileURL;
- createFileURL("new_cond_format_test.ods", aFileURL);
- if(!mxComponent.is())
- mxComponent = loadFromDesktop(aFileURL);
- CPPUNIT_ASSERT_MESSAGE("Component not loaded",mxComponent.is());
-
- // get the first sheet
- uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, uno::UNO_QUERY_THROW);
- uno::Reference< container::XIndexAccess > xIndex (xDoc->getSheets(), uno::UNO_QUERY_THROW);
- uno::Reference< sheet::XSpreadsheet > xSheet( xIndex->getByIndex(0), uno::UNO_QUERY_THROW);
-
- return xSheet;
-}
-
-void ScConditionalFormatTest::testCondFormat()
-{
- uno::Reference< sheet::XSpreadsheet > aSheet(init(), uno::UNO_QUERY_THROW);
- uno::Reference< beans::XPropertySet > xProps;
- uno::Reference< sheet::XSheetConditionalEntries > xSheetConditionalEntries;
-
- xProps.set(aSheet->getCellRangeByPosition(1, 1, 1, 21), uno::UNO_QUERY_THROW);
- xSheetConditionalEntries.set(xProps->getPropertyValue(SC_UNONAME_CONDFMT), uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSheetConditionalEntries->getCount());
-
- uno::Sequence< beans::PropertyValue > aPropertyValueList(5);
- aPropertyValueList[0].Name = SC_UNONAME_STYLENAME;
- aPropertyValueList[0].Value <<= OUString("Result2");
- aPropertyValueList[1].Name = SC_UNONAME_FORMULA1;
- aPropertyValueList[1].Value <<= OUString("$Sheet1.$B$2");
- aPropertyValueList[2].Name = SC_UNONAME_FORMULA2;
- aPropertyValueList[2].Value <<= OUString("$Sheet1.$A$2");
- aPropertyValueList[3].Name = SC_UNONAME_OPERATOR;
- aPropertyValueList[3].Value <<= sheet::ConditionOperator_EQUAL;
- aPropertyValueList[4].Name = SC_UNONAME_SOURCEPOS;
- aPropertyValueList[4].Value <<= table::CellAddress(0, 0, 16);
- xSheetConditionalEntries->addNew(aPropertyValueList);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xSheetConditionalEntries->getCount());
- xProps->setPropertyValue(SC_UNONAME_CONDFMT, uno::makeAny(xSheetConditionalEntries));
-
- xProps.set(aSheet->getCellByPosition(0, 16), uno::UNO_QUERY_THROW);
- xSheetConditionalEntries.set(xProps->getPropertyValue(SC_UNONAME_CONDFMT), uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSheetConditionalEntries->getCount());
-
- // clear conditional formatting in cell $B$17
- xProps.set(aSheet->getCellByPosition(1, 16), uno::UNO_QUERY_THROW);
- xSheetConditionalEntries.set(xProps->getPropertyValue(SC_UNONAME_CONDFMT), uno::UNO_QUERY_THROW);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xSheetConditionalEntries->getCount());
- xSheetConditionalEntries->clear();
- xProps->setPropertyValue(SC_UNONAME_CONDFMT, uno::makeAny(xSheetConditionalEntries));
-
- xProps.set(aSheet->getCellByPosition(1, 16), uno::UNO_QUERY_THROW);
- xSheetConditionalEntries.set(xProps->getPropertyValue(SC_UNONAME_CONDFMT), uno::UNO_QUERY_THROW);
- // This was 1 before - conditional formats were not removed
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xSheetConditionalEntries->getCount());
-}
-
-void ScConditionalFormatTest::tearDown()
-{
- if (mxComponent.is())
- {
- closeDocument(mxComponent);
- }
-
- CalcUnoApiTest::tearDown();
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(ScConditionalFormatTest);
-
-}
-
-CPPUNIT_PLUGIN_IMPLEMENT();
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list