summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2022-07-01 13:31:02 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2022-07-02 08:49:50 +0200
commitb170210ddf1cf45fbfbce2e4213330bd036162f0 (patch)
tree1a7077cf6833a17794689a698ab433b68ed98652 /sc
parent870452546a56ce635f36247c44aee6068d70c053 (diff)
sc: remove CppunitTest_sc_chart_regression_test
it only contains one test and it does the same as CppunitTest_chart2_xshape, so just move the test there. I don't know whether ScChartRegressionTest::test was ever executed but the reference needs to be adapted Change-Id: I0447054d8692901c72a36be5f582723334d2acba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136737 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc')
-rw-r--r--sc/CppunitTest_sc_chart_regression_test.mk117
-rw-r--r--sc/Module_sc.mk3
-rw-r--r--sc/qa/extras/regression-test.cxx114
3 files changed, 0 insertions, 234 deletions
diff --git a/sc/CppunitTest_sc_chart_regression_test.mk b/sc/CppunitTest_sc_chart_regression_test.mk
deleted file mode 100644
index 92033882479b..000000000000
--- a/sc/CppunitTest_sc_chart_regression_test.mk
+++ /dev/null
@@ -1,117 +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_chart_regression_test))
-
-$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_chart_regression_test))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sc_chart_regression_test, \
- sc/qa/extras/regression-test \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- drawinglayer \
- drawinglayercore \
- editeng \
- for \
- forui \
- i18nlangtag \
- msfilter \
- oox \
- sal \
- salhelper \
- sax \
- sb \
- sc \
- sfx \
- sot \
- subsequenttest \
- svl \
- svt \
- svx \
- svxcore \
- test \
- tk \
- tl \
- ucbhelper \
- unotest \
- utl \
- $(call gb_Helper_optional,SCRIPTING, \
- vbahelper) \
- vcl \
- xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sc_chart_regression_test,\
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sc_chart_regression_test,\
- offapi \
- oovbaapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sc_chart_regression_test))
-
-$(eval $(call gb_CppunitTest_use_components,sc_chart_regression_test,\
- basic/util/sb \
- chart2/source/chartcore \
- chart2/source/controller/chartcontroller \
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- dbaccess/util/dba \
- embeddedobj/util/embobj \
- eventattacher/source/evtatt \
- filter/source/config/cache/filterconfig1 \
- 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 \
- scaddins/source/analysis/analysis \
- scaddins/source/datefunc/date \
- 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 \
- svl/util/svl \
- svx/util/svx \
- svx/util/svxcore \
- 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 \
- vcl/vcl.common \
- xmloff/util/xo \
-))
-
-$(eval $(call gb_CppunitTest_use_configuration,sc_chart_regression_test))
-
-$(eval $(call gb_CppunitTest_use_external,sc_chart_regression_test,libxml2))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 5cea4b59d426..5a0d0c13f40e 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -112,9 +112,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \
))
endif
-# Disabled to allow the check tinderbox execute the sd tests
-# CppunitTest_sc_chart_regression_test \
-
$(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
JunitTest_sc_complex \
JunitTest_sc_unoapi_1 \
diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx
deleted file mode 100644
index 0e26ce2523ba..000000000000
--- a/sc/qa/extras/regression-test.cxx
+++ /dev/null
@@ -1,114 +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 <sal/config.h>
-#include <test/unoapi_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-
-#include <sfx2/app.hxx>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/sfxmodelfactory.hxx>
-#include <svl/intitem.hxx>
-
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/table/XTableChartsSupplier.hpp>
-#include <com/sun/star/table/XTableCharts.hpp>
-#include <com/sun/star/table/XTableChart.hpp>
-#include <com/sun/star/document/XEmbeddedObjectSupplier.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/qa/XDumper.hpp>
-
-#include <test/xmldiff.hxx>
-
-#include <basic/sbxdef.hxx>
-
-#include "docsh.hxx"
-#include "patattr.hxx"
-#include "scitems.hxx"
-#include "document.hxx"
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
-namespace {
-
-bool checkDumpAgainstFile( const OUString& rDump, const OUString aFilePath, const OUString& rToleranceFile)
-{
- OString aOFile = OUStringToOString(aFilePath, RTL_TEXTENCODING_UTF8);
- OString aToleranceFile = OUStringToOString(rToleranceFile, RTL_TEXTENCODING_UTF8);
-
- CPPUNIT_ASSERT_MESSAGE("dump is empty", !rDump.isEmpty());
-
- OString aDump = OUStringToOString(rDump, RTL_TEXTENCODING_UTF8);
- return doXMLDiff(aOFile.getStr(), aDump.getStr(),
- static_cast<int>(rDump.getLength()), aToleranceFile.getStr());
-}
-
-}
-
-class ScChartRegressionTest : public UnoApiTest
-{
-public:
- ScChartRegressionTest();
-
- void test();
-
- CPPUNIT_TEST_SUITE(ScChartRegressionTest);
- CPPUNIT_TEST(test);
- CPPUNIT_TEST_SUITE_END();
-
-};
-
-void ScChartRegressionTest::test()
-{
- OUString aFileName;
- createFileURL( "testChart.ods", aFileName);
- uno::Reference< css::lang::XComponent > xComponent = loadFromDesktop(aFileName, "com.sun.star.sheet.SpreadsheetDocument");
-
- uno::Reference< sheet::XSpreadsheetDocument > xDoc(xComponent, UNO_QUERY_THROW);
-
- uno::Reference< container::XIndexAccess > xIA(xDoc->getSheets(), UNO_QUERY_THROW);
-
- uno::Reference< table::XTableChartsSupplier > xChartSupplier( xIA->getByIndex(0), UNO_QUERY_THROW);
-
- uno::Reference< table::XTableCharts > xCharts = xChartSupplier->getCharts();
- CPPUNIT_ASSERT(xCharts.is());
-
- uno::Reference< container::XIndexAccess > xIACharts(xCharts, UNO_QUERY_THROW);
- uno::Reference< table::XTableChart > xChart( xIACharts->getByIndex(0), UNO_QUERY_THROW);
-
- uno::Reference< document::XEmbeddedObjectSupplier > xEmbObjectSupplier(xChart, UNO_QUERY_THROW);
-
- uno::Reference< lang::XComponent > xChartComp( xEmbObjectSupplier->getEmbeddedObject(), UNO_QUERY_THROW );
-
- uno::Reference< chart2::XChartDocument > xChartDoc ( xChartComp, UNO_QUERY_THROW );
-
- uno::Reference< qa::XDumper > xDumper( xChartDoc, UNO_QUERY_THROW );
-
- OUString aDump = xDumper->dump();
- std::cout << aDump;
- bool bCompare = checkDumpAgainstFile( aDump, getPathFromSrc("/chart2/qa/unit/data/reference/testChart.xml"), getPathFromSrc("/chart2/qa/unit/data/tolerance.xml") );
- CPPUNIT_ASSERT(bCompare);
-}
-
-ScChartRegressionTest::ScChartRegressionTest()
- : UnoApiTest("/chart2/qa/unit/data/ods")
-{
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(ScChartRegressionTest);
-
-CPPUNIT_PLUGIN_IMPLEMENT();
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */