[Libreoffice-commits] core.git: solenv/clang-format sw/CppunitTest_sw_layout_test.mk sw/qa
Miklos Vajna
vmiklos at collabora.co.uk
Thu Apr 19 08:13:52 UTC 2018
solenv/clang-format/blacklist | 1
sw/CppunitTest_sw_layout_test.mk | 96 -------------------------------------
sw/qa/core/layout-test.cxx | 101 ---------------------------------------
3 files changed, 198 deletions(-)
New commits:
commit 14f18649329ebb16d2ae70b36298243237652a7c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Apr 18 22:46:23 2018 +0200
sw: remove dead SwLayoutTest
Obsoleted by SwLayoutWriter and SwModelTestBase::dumpLayout() in
general.
Change-Id: Ibcd1b34aaa8781f3199572f8795f2cb6daff264f
Reviewed-on: https://gerrit.libreoffice.org/53127
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 3ef8903afca2..c9a12c4d57d7 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -15150,7 +15150,6 @@ sw/inc/viscrs.hxx
sw/inc/wdocsh.hxx
sw/qa/core/Test-BigPtrArray.cxx
sw/qa/core/filters-test.cxx
-sw/qa/core/layout-test.cxx
sw/qa/core/macros-test.cxx
sw/qa/core/test_ToxLinkProcessor.cxx
sw/qa/core/test_ToxMiscTest.cxx
diff --git a/sw/CppunitTest_sw_layout_test.mk b/sw/CppunitTest_sw_layout_test.mk
deleted file mode 100644
index ff410443e536..000000000000
--- a/sw/CppunitTest_sw_layout_test.mk
+++ /dev/null
@@ -1,96 +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,sw_layout_test))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_layout_test, \
- sw/qa/core/layout-test \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- drawinglayer \
- editeng \
- for \
- forui \
- i18nlangtag \
- msfilter \
- oox \
- sal \
- salhelper \
- sax \
- sw \
- sfx \
- sot \
- svl \
- svt \
- svx \
- svxcore \
- test \
- tl \
- tk \
- ucbhelper \
- unotest \
- utl \
- vbahelper \
- vcl \
- xo \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_layout_test,\
- -I$(SRCDIR)/sw/inc \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_layout_test,\
- offapi \
- oovbaapi \
- udkapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_layout_test))
-
-$(eval $(call gb_CppunitTest_use_components,sw_layout_test,\
- comphelper/util/comphelp \
- configmgr/source/configmgr \
- dbaccess/util/dba \
- 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 \
- 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_layout_test))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/qa/core/layout-test.cxx b/sw/qa/core/layout-test.cxx
deleted file mode 100644
index cf7db110adf4..000000000000
--- a/sw/qa/core/layout-test.cxx
+++ /dev/null
@@ -1,101 +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 <unotest/macros_test.hxx>
-#include <test/bootstrapfixture.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-
-#include <com/sun/star/frame/Desktop.hpp>
-
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/document/MacroExecMode.hpp>
-
-#include <sfx2/app.hxx>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/sfxmodelfactory.hxx>
-#include <svl/intitem.hxx>
-
-using namespace ::com::sun::star::uno;
-using namespace com::sun::star;
-
-/* Implementation of Macros test */
-
-class SwLayoutTest : public test::BootstrapFixture, public unotest::MacrosTest
-{
-public:
- SwLayoutTest();
-
- void createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath);
-
- virtual void setUp();
- virtual void tearDown();
-
- void test();
-
- CPPUNIT_TEST_SUITE(SwLayoutTest);
-#if !defined(MACOSX) && !defined(_WIN32)
- CPPUNIT_TEST(test);
-#endif
- CPPUNIT_TEST_SUITE_END();
-
-private:
- uno::Reference<uno::XInterface> m_xWriterComponent;
- OUString m_aBaseString;
-};
-
-void SwLayoutTest::createFileURL(const OUString& aFileBase, const OUString& aFileExtension, OUString& rFilePath)
-{
- OUString aSep("/");
- OUStringBuffer aBuffer( getSrcRootURL() );
- aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension);
- aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
- rFilePath = aBuffer.makeStringAndClear();
-}
-
-void SwLayoutTest::test()
-{
- OUString aFilePath;
- OUString aFileBase("test.");
- OUString aExtension("odt");
- createFileURL(aFileBase, aExtension, aFilePath);
- uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFilePath, "com.sun.star.text.TextDocument");
- CPPUNIT_ASSERT(xComponent.is());
-}
-
-SwLayoutTest::SwLayoutTest()
- : m_aBaseString("/sw/qa/core/data")
-{
-}
-
-void SwLayoutTest::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("com.sun.star.comp.Writer.TextDocument");
- CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xWriterComponent.is());
- mxDesktop = css::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) );
-}
-
-void SwLayoutTest::tearDown()
-{
- uno::Reference< lang::XComponent >( m_xWriterComponent, UNO_QUERY_THROW )->dispose();
- test::BootstrapFixture::tearDown();
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(SwLayoutTest);
-
-CPPUNIT_PLUGIN_IMPLEMENT();
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list