From bdcdbf5da0aa17f7a347ab25b5f6e0b1bea87d62 Mon Sep 17 00:00:00 2001 From: Marcos Paulo de Souza Date: Sat, 3 Nov 2012 20:30:40 -0200 Subject: Remove unused method and also remove not build test These tests are not in the main build, so remove it all. Change-Id: Ia0e13c984fe11b543a66d3150082cbdd7f34296a Signed-off-by: Marcos Paulo de Souza Reviewed-on: https://gerrit.libreoffice.org/977 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard --- sw/CppunitTest_sw_regression_test.mk | 126 -------------------- sw/qa/extras/regression-test.cxx | 170 --------------------------- unotest/inc/unotest/bootstrapfixturebase.hxx | 3 - unotest/source/cpp/bootstrapfixturebase.cxx | 5 - unusedcode.easy | 1 - 5 files changed, 305 deletions(-) delete mode 100644 sw/CppunitTest_sw_regression_test.mk delete mode 100644 sw/qa/extras/regression-test.cxx diff --git a/sw/CppunitTest_sw_regression_test.mk b/sw/CppunitTest_sw_regression_test.mk deleted file mode 100644 index 32d2bdb46c55..000000000000 --- a/sw/CppunitTest_sw_regression_test.mk +++ /dev/null @@ -1,126 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. -#************************************************************************* - -$(eval $(call gb_CppunitTest_CppunitTest,sw_regression_test)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sw_regression_test, \ - sw/qa/extras/regression-test \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sw_regression_test, \ - avmedia \ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - drawinglayer \ - editeng \ - fileacc \ - for \ - forui \ - i18nisolang1 \ - msfilter \ - oox \ - sal \ - salhelper \ - sax \ - sb \ - sw \ - sfx \ - sot \ - svl \ - svt \ - svx \ - svxcore \ - test \ - tl \ - tk \ - ucbhelper \ - unotest \ - utl \ - vbahelper \ - vcl \ - xo \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_CppunitTest_set_include,sw_regression_test,\ - -I$(SRCDIR)/sw/source/ui/inc \ - -I$(SRCDIR)/sw/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_CppunitTest_use_api,sw_regression_test,\ - offapi \ - oovbaapi \ - udkapi \ -)) - -$(eval $(call gb_CppunitTest_use_ure,sw_regression_test)) - -$(eval $(call gb_CppunitTest_use_components,sw_regression_test,\ - basic/util/sb \ - comphelper/util/comphelp \ - configmgr/source/configmgr \ - dbaccess/util/dba \ - fileaccess/source/fileacc \ - filter/source/config/cache/filterconfig1 \ - forms/util/frm \ - framework/util/fwk \ - i18npool/util/i18npool \ - oox/util/oox \ - package/source/xstor/xstor \ - package/util/package2 \ - sax/source/expatwrap/expwrap \ - sax/source/fastparser/fastsax \ - sw/util/sw \ - sw/util/swd \ - sw/util/msword \ - sw/util/vbaswobj \ - scripting/source/basprov/basprov \ - scripting/util/scriptframe \ - 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 \ -)) - -$(eval $(call gb_CppunitTest_use_configuration,sw_regression_test)) - -$(eval $(call gb_CppunitTest_use_filter_configuration,sw_regression_test)) - -$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_regression_test)) - -# vim: set noet sw=4 ts=4: diff --git a/sw/qa/extras/regression-test.cxx b/sw/qa/extras/regression-test.cxx deleted file mode 100644 index 910d4867c9a6..000000000000 --- a/sw/qa/extras/regression-test.cxx +++ /dev/null @@ -1,170 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * Version: MPL 1.1 / GPLv3+ / LGPLv3+ - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License or as specified alternatively below. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * Major Contributor(s): - * Copyright (C) 2012 Markus Mohrhard (initial developer) - * - * All Rights Reserved. - * - * For minor contributions see the git repository. - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 3 or later (the "GPLv3+"), or - * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), - * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable - * instead of those above. - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include -#include - -using namespace com::sun::star; -using namespace com::sun::star::uno; - -namespace { - -bool compareFiles( const rtl::OUString& aFileNameOne, const rtl::OUString& aFileNameTwo) -{ - rtl::OString aOFileNameOne = rtl::OUStringToOString(aFileNameOne, RTL_TEXTENCODING_UTF8); - std::ifstream aFileOne(aOFileNameOne.getStr()); - rtl::OString aOFileNameTwo = rtl::OUStringToOString(aFileNameTwo, RTL_TEXTENCODING_UTF8); - std::ifstream aFileTwo(aOFileNameTwo.getStr()); - - CPPUNIT_ASSERT_MESSAGE("files not open", aFileOne.is_open() && aFileTwo.is_open()); - - sal_Int32 nLine = 1; - while(!aFileOne.eof() && !aFileTwo.eof()) - { - std::string aLineFileOne; - std::string aLineFileTwo; - - std::getline(aFileOne, aLineFileOne); - std::getline(aFileTwo, aLineFileTwo); - - if( aLineFileOne != aLineFileTwo) - { - rtl::OStringBuffer aErrorMessage("Mismatch between reference file and exported file in line "); - aErrorMessage.append(nLine).append(".\nExpected: "); - aErrorMessage.append(aLineFileOne.c_str()).append("\nFound : ").append(aLineFileTwo.c_str()); - CPPUNIT_ASSERT_MESSAGE(aErrorMessage.getStr(), false); - } - nLine++; - } - return true; -} - -} - -class SwRegressionTest : public test::BootstrapFixture, unotest::MacrosTest -{ -public: - SwRegressionTest(); - - virtual void setUp(); - virtual void tearDown(); - - void test(); - - CPPUNIT_TEST_SUITE(SwRegressionTest); - CPPUNIT_TEST(test); - CPPUNIT_TEST_SUITE_END(); - -private: - uno::Reference m_xWriterComponent; - ::rtl::OUString m_aBaseString; -}; - -void SwRegressionTest::test() -{ - uno::Reference< lang::XComponent > xComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/data/odt/test.odt")); - CPPUNIT_ASSERT(xComponent.is()); - - uno::Reference< frame::XStorable > xStorable(xComponent, UNO_QUERY_THROW); - CPPUNIT_ASSERT(xStorable.is()); - - uno::Sequence< beans::PropertyValue > aArgs(2); - - beans::PropertyValue aValue; - uno::Any aAny; - - aAny <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("writer_layout_dump")); - - aValue.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName")); - aValue.Value = aAny; - aValue.State = beans::PropertyState_DIRECT_VALUE; - aArgs[0] = aValue; - - beans::PropertyValue aValue2; - uno::Any aAny2; - - aAny2 <<= (sal_Bool)sal_True; - - aValue2.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Overwrite")); - aValue2.Value = aAny2; - aValue2.State = beans::PropertyState_DIRECT_VALUE; - - aArgs[1] = aValue2; - - xStorable->storeToURL(getURLFromSolver("/unittest/sw/test.xml"), aArgs); -} - -SwRegressionTest::SwRegressionTest() - : m_aBaseString(RTL_CONSTASCII_USTRINGPARAM("/sw/qa/core/data")) -{ -} - -void SwRegressionTest::setUp() -{ - test::BootstrapFixture::setUp(); - - // This is a bit of a fudge, we do this to ensure that SwGlobals::ensure, - // which is a private symbol to us, gets called - m_xWriterComponent = - getMultiServiceFactory()->createInstance(rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Writer.TextDocument"))); - CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is()); - mxDesktop = Reference( getMultiServiceFactory()->createInstance( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY ); - CPPUNIT_ASSERT_MESSAGE("", mxDesktop.is()); -} - -void SwRegressionTest::tearDown() -{ - uno::Reference< lang::XComponent >( m_xWriterComponent, UNO_QUERY_THROW )->dispose(); - test::BootstrapFixture::tearDown(); -} - -CPPUNIT_TEST_SUITE_REGISTRATION(SwRegressionTest); - -CPPUNIT_PLUGIN_IMPLEMENT(); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/unotest/inc/unotest/bootstrapfixturebase.hxx b/unotest/inc/unotest/bootstrapfixturebase.hxx index 300539682b8d..085d014c1b1a 100644 --- a/unotest/inc/unotest/bootstrapfixturebase.hxx +++ b/unotest/inc/unotest/bootstrapfixturebase.hxx @@ -80,9 +80,6 @@ public: // return a Path to a given c-str path from the source directory ::rtl::OUString getPathFromSrc( const char *pPath ); - // return a URL to a given c-str path from the solver directory - ::rtl::OUString getURLFromSolver( const char *pPath ); - virtual void setUp(); virtual void tearDown(); diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx index 0a4e15c87edf..42982c27e0a6 100644 --- a/unotest/source/cpp/bootstrapfixturebase.cxx +++ b/unotest/source/cpp/bootstrapfixturebase.cxx @@ -81,11 +81,6 @@ test::BootstrapFixtureBase::~BootstrapFixtureBase() return m_aSrcRootPath + rtl::OUString::createFromAscii( pPath ); } -::rtl::OUString test::BootstrapFixtureBase::getURLFromSolver( const char *pPath ) -{ - return m_aSolverRootURL + rtl::OUString::createFromAscii( pPath ); -} - void test::BootstrapFixtureBase::setUp() { // set UserInstallation to user profile dir in test/user-template diff --git a/unusedcode.easy b/unusedcode.easy index a6b5cd7f2cc4..24cd7d65e90b 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -96,4 +96,3 @@ sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::CreateInstance(SfxViewFrame*, SfxViewShell*) std::__cxx1998::vector >::~vector() std::__cxx1998::vector, std::allocator >, std::basic_string, std::allocator > >, std::allocator, std::allocator >, std::basic_string, std::allocator > > > >::~vector() -test::BootstrapFixtureBase::getURLFromSolver(char const*) -- cgit