From 578ff092c9726fb2fd18b1a21a5846855a641508 Mon Sep 17 00:00:00 2001
From: Mihai Varga <mihai.varga@collabora.com>
Date: Wed, 9 Sep 2015 15:08:26 +0300
Subject: [PATCH 103/398] LOK: moved the decalaration of LibLODocument_Impl to
make it visible
We needed a better way to test LOK methods that are not app specific,
but are defined in /desktop/source/lib/init.cxx. So the decalaration
needs to be visible.
I also moved the `getStyles` test in the new test file
Change-Id: I98d97dc17a66e72732ca7bd848c131610790f48e
(cherry picked from commit 2290efa4a22d42cd9099b63b9138e4ff994c07f9)
---
desktop/CppunitTest_desktop_lib.mk | 68 ++++++++++++++++
desktop/Module_desktop.mk | 4 +
desktop/inc/lib/init.hxx | 27 +++++++
desktop/qa/data/blank_text.odt | Bin 0 -> 8295 bytes
desktop/qa/desktop_lib/test_desktop_lib.cxx | 116 ++++++++++++++++++++++++++++
desktop/source/lib/init.cxx | 79 +++++++++----------
libreofficekit/qa/unit/tiledrendering.cxx | 34 --------
7 files changed, 252 insertions(+), 76 deletions(-)
create mode 100644 desktop/CppunitTest_desktop_lib.mk
create mode 100644 desktop/inc/lib/init.hxx
create mode 100644 desktop/qa/data/blank_text.odt
create mode 100644 desktop/qa/desktop_lib/test_desktop_lib.cxx
diff --git a/desktop/CppunitTest_desktop_lib.mk b/desktop/CppunitTest_desktop_lib.mk
new file mode 100644
index 000000000000..be394600ddf0
--- /dev/null
+++ b/desktop/CppunitTest_desktop_lib.mk
@@ -0,0 +1,68 @@
+# -*- 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,desktop_lib))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,desktop_lib, \
+ desktop/qa/desktop_lib/test_desktop_lib \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,desktop_lib, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sfx \
+ sofficeapp \
+ subsequenttest \
+ sw \
+ test \
+ unotest \
+ vcl \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_external,desktop_lib,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_api,desktop_lib,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,desktop_lib))
+
+$(eval $(call gb_CppunitTest_use_vcl,desktop_lib))
+
+$(eval $(call gb_CppunitTest_use_components,desktop_lib,\
+ comphelper/util/comphelp \
+ configmgr/source/configmgr \
+ filter/source/config/cache/filterconfig1 \
+ filter/source/storagefilterdetect/storagefd \
+ framework/util/fwk \
+ i18npool/util/i18npool \
+ package/source/xstor/xstor \
+ package/util/package2 \
+ sax/source/expatwrap/expwrap \
+ sfx2/util/sfx \
+ svl/source/fsstor/fsstorage \
+ svtools/util/svt \
+ sw/util/sw \
+ sw/util/swd \
+ toolkit/util/tk \
+ ucb/source/core/ucb1 \
+ ucb/source/ucp/file/ucpfile1 \
+ unoxml/source/service/unoxml \
+ xmloff/util/xo \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,desktop_lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index ab04152731ce..c725a268721e 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -130,4 +130,8 @@ $(eval $(call gb_Module_add_check_targets,desktop, \
CppunitTest_desktop_version \
))
+$(eval $(call gb_Module_add_check_targets,desktop, \
+ CppunitTest_desktop_lib \
+))
+
# vim: set ts=4 sw=4 et:
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
new file mode 100644
index 000000000000..b17f82566daf
--- /dev/null
+++ b/desktop/inc/lib/init.hxx
@@ -0,0 +1,27 @@
+/* -*- 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 <LibreOfficeKit/LibreOfficeKit.h>
+#include <com/sun/star/frame/XStorable.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <boost/shared_ptr.hpp>
+#include "../../source/inc/desktopdllapi.h"
+
+using namespace css;
+using namespace boost;
+
+namespace desktop {
+ struct DESKTOP_DLLPUBLIC LibLODocument_Impl : public _LibreOfficeKitDocument
+ {
+ uno::Reference<css::lang::XComponent> mxComponent;
+ shared_ptr< LibreOfficeKitDocumentClass > m_pDocumentClass;
+
+ explicit LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent);
+ ~LibLODocument_Impl();
+ };
+}
diff --git a/desktop/qa/data/blank_text.odt b/desktop/qa/data/blank_text.odt
new file mode 100644
index 0000000000000000000000000000000000000000..00b92d785acd15b68c927aa3b2f1a5d3f1614425
GIT binary patch
literal 8295
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
literal 0
HcmV?d00001
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
new file mode 100644
index 000000000000..c88a53f41edb
--- /dev/null
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -0,0 +1,116 @@
+/* -*- 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 <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/frame/XComponentLoader.hpp>
+
+#include <boost/property_tree/json_parser.hpp>
+#include <comphelper/processfactory.hxx>
+#include <sfx2/objsh.hxx>
+#include <test/unoapi_test.hxx>
+
+#include "../../inc/lib/init.hxx"
+
+using namespace com::sun::star;
+using namespace desktop;
+
+class DesktopLOKTest : public UnoApiTest
+{
+public:
+ DesktopLOKTest() : UnoApiTest("/desktop/qa/data/")
+ {
+ }
+
+ virtual ~DesktopLOKTest()
+ {
+ }
+
+ virtual void setUp() SAL_OVERRIDE
+ {
+ UnoApiTest::setUp();
+ mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
+ };
+
+ virtual void tearDown() SAL_OVERRIDE
+ {
+ closeDoc();
+ UnoApiTest::tearDown();
+ };
+
+ LibLODocument_Impl* loadDoc(const char* pName);
+ void closeDoc();
+
+ void runAllTests();
+ void testGetStyles();
+
+ CPPUNIT_TEST_SUITE(DesktopLOKTest);
+ CPPUNIT_TEST(runAllTests);
+ CPPUNIT_TEST_SUITE_END();
+
+ uno::Reference<lang::XComponent> mxComponent;
+};
+
+LibLODocument_Impl* DesktopLOKTest::loadDoc(const char* pName)
+{
+ OUString aFileURL;
+ createFileURL(OUString::createFromAscii(pName), aFileURL);
+ mxComponent = loadFromDesktop(aFileURL, "com.sun.star.text.TextDocument");
+ if (!mxComponent.is())
+ {
+ CPPUNIT_ASSERT(false);
+ }
+ return new LibLODocument_Impl(mxComponent);
+}
+
+void DesktopLOKTest::closeDoc()
+{
+ if (mxComponent.is())
+ {
+ closeDocument(mxComponent);
+ mxComponent.clear();
+ }
+}
+
+void DesktopLOKTest::runAllTests()
+{
+ testGetStyles();
+}
+
+void DesktopLOKTest::testGetStyles()
+{
+ LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
+ boost::property_tree::ptree aTree;
+ char* pJSON = pDocument->m_pDocumentClass->getStyles(pDocument);
+ std::stringstream aStream(pJSON);
+ boost::property_tree::read_json(aStream, aTree);
+ CPPUNIT_ASSERT( aTree.size() > 0 );
+
+ for (const std::pair<std::string, boost::property_tree::ptree>& rPair : aTree)
+ {
+ CPPUNIT_ASSERT( rPair.second.size() > 0);
+ if (rPair.first != "CharacterStyles" &&
+ rPair.first != "ParagraphStyles" &&
+ rPair.first != "FrameStyles" &&
+ rPair.first != "PageStyles" &&
+ rPair.first != "NumberingStyles" &&
+ rPair.first != "CellStyles" &&
+ rPair.first != "ShapeStyles")
+ {
+ CPPUNIT_FAIL("Unknown style family: " + rPair.first);
+ }
+ }
+ closeDoc();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c7f3aabb58b7..a20decd3afbe 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -64,6 +64,7 @@
// We also need to hackily be able to start the main libreoffice thread:
#include "../app/sofficemain.h"
#include "../app/officeipcthread.hxx"
+#include "../../inc/lib/init.hxx"
using namespace css;
using namespace vcl;
@@ -72,7 +73,6 @@ using namespace utl;
using namespace boost;
-struct LibLODocument_Impl;
struct LibLibreOffice_Impl;
static LibLibreOffice_Impl *gImpl = NULL;
@@ -237,51 +237,46 @@ static void doc_setGraphicSelection (LibreOfficeKitDocument* pThis,
static void doc_resetSelection (LibreOfficeKitDocument* pThis);
static char* doc_getStyles(LibreOfficeKitDocument* pThis);
-struct LibLODocument_Impl : public _LibreOfficeKitDocument
-{
- uno::Reference<css::lang::XComponent> mxComponent;
- shared_ptr< LibreOfficeKitDocumentClass > m_pDocumentClass;
- explicit LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent) :
- mxComponent( xComponent )
+LibLODocument_Impl::LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent) :
+ mxComponent( xComponent )
+{
+ if (!(m_pDocumentClass = gDocumentClass.lock()))
{
- if (!(m_pDocumentClass = gDocumentClass.lock()))
- {
- m_pDocumentClass.reset(new LibreOfficeKitDocumentClass);
-
- m_pDocumentClass->nSize = sizeof(LibreOfficeKitDocument);
-
- m_pDocumentClass->destroy = doc_destroy;
- m_pDocumentClass->saveAs = doc_saveAs;
- m_pDocumentClass->getDocumentType = doc_getDocumentType;
- m_pDocumentClass->getParts = doc_getParts;
- m_pDocumentClass->getPart = doc_getPart;
- m_pDocumentClass->setPart = doc_setPart;
- m_pDocumentClass->getPartName = doc_getPartName;
- m_pDocumentClass->setPartMode = doc_setPartMode;
- m_pDocumentClass->paintTile = doc_paintTile;
- m_pDocumentClass->getDocumentSize = doc_getDocumentSize;
- m_pDocumentClass->initializeForRendering = doc_initializeForRendering;
- m_pDocumentClass->registerCallback = doc_registerCallback;
- m_pDocumentClass->postKeyEvent = doc_postKeyEvent;
- m_pDocumentClass->postMouseEvent = doc_postMouseEvent;
- m_pDocumentClass->postUnoCommand = doc_postUnoCommand;
- m_pDocumentClass->setTextSelection = doc_setTextSelection;
- m_pDocumentClass->getTextSelection = doc_getTextSelection;
- m_pDocumentClass->setGraphicSelection = doc_setGraphicSelection;
- m_pDocumentClass->resetSelection = doc_resetSelection;
- m_pDocumentClass->getStyles = doc_getStyles;
-
- gDocumentClass = m_pDocumentClass;
- }
- pClass = m_pDocumentClass.get();
+ m_pDocumentClass.reset(new LibreOfficeKitDocumentClass);
+
+ m_pDocumentClass->nSize = sizeof(LibreOfficeKitDocument);
+
+ m_pDocumentClass->destroy = doc_destroy;
+ m_pDocumentClass->saveAs = doc_saveAs;
+ m_pDocumentClass->getDocumentType = doc_getDocumentType;
+ m_pDocumentClass->getParts = doc_getParts;
+ m_pDocumentClass->getPart = doc_getPart;
+ m_pDocumentClass->setPart = doc_setPart;
+ m_pDocumentClass->getPartName = doc_getPartName;
+ m_pDocumentClass->setPartMode = doc_setPartMode;
+ m_pDocumentClass->paintTile = doc_paintTile;
+ m_pDocumentClass->getDocumentSize = doc_getDocumentSize;
+ m_pDocumentClass->initializeForRendering = doc_initializeForRendering;
+ m_pDocumentClass->registerCallback = doc_registerCallback;
+ m_pDocumentClass->postKeyEvent = doc_postKeyEvent;
+ m_pDocumentClass->postMouseEvent = doc_postMouseEvent;
+ m_pDocumentClass->postUnoCommand = doc_postUnoCommand;
+ m_pDocumentClass->setTextSelection = doc_setTextSelection;
+ m_pDocumentClass->getTextSelection = doc_getTextSelection;
+ m_pDocumentClass->setGraphicSelection = doc_setGraphicSelection;
+ m_pDocumentClass->resetSelection = doc_resetSelection;
+ m_pDocumentClass->getStyles = doc_getStyles;
+
+ gDocumentClass = m_pDocumentClass;
}
+ pClass = m_pDocumentClass.get();
+}
- ~LibLODocument_Impl()
- {
- mxComponent->dispose();
- }
-};
+LibLODocument_Impl::~LibLODocument_Impl()
+{
+ mxComponent->dispose();
+}
static void doc_destroy(LibreOfficeKitDocument *pThis)
{
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx
index a0f4bcb5b8eb..aa68c724f0f3 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -68,7 +68,6 @@ public:
void testDocumentTypes( Office* pOffice );
void testImpressSlideNames( Office* pOffice );
void testCalcSheetNames( Office* pOffice );
- void testGetStyles( Office* pOffice );
#if 0
void testOverlay( Office* pOffice );
#endif
@@ -95,7 +94,6 @@ void TiledRenderingTest::runAllTests()
testDocumentTypes( pOffice.get() );
testImpressSlideNames( pOffice.get() );
testCalcSheetNames( pOffice.get() );
- testGetStyles( pOffice.get() );
#if 0
testOverlay( pOffice.get() );
#endif
@@ -184,38 +182,6 @@ void TiledRenderingTest::testCalcSheetNames( Office* pOffice )
CPPUNIT_ASSERT( strcmp( pDocument->getPartName( 2 ), "Sheet3" ) == 0 );
}
-void TiledRenderingTest::testGetStyles( Office* pOffice )
-{
- const string sDocPath = m_sSrcRoot + "/libreofficekit/qa/data/blank_text.odt";
- const string sLockFile = m_sSrcRoot +"/libreofficekit/qa/data/.~lock.blank_text.odt#";
-
- // FIXME: LOK will fail when trying to open a locked file
- remove( sLockFile.c_str() );
-
- scoped_ptr< Document> pDocument( pOffice->documentLoad( sDocPath.c_str() ) );
-
- boost::property_tree::ptree aTree;
- char* pJSON = pDocument->getStyles();
- std::stringstream aStream(pJSON);
- boost::property_tree::read_json(aStream, aTree);
- CPPUNIT_ASSERT( aTree.size() > 0 );
-
- for (const std::pair<std::string, boost::property_tree::ptree>& rPair : aTree)
- {
- CPPUNIT_ASSERT( rPair.second.size() > 0);
- if (rPair.first != "CharacterStyles" &&
- rPair.first != "ParagraphStyles" &&
- rPair.first != "FrameStyles" &&
- rPair.first != "PageStyles" &&
- rPair.first != "NumberingStyles" &&
- rPair.first != "CellStyles" &&
- rPair.first != "ShapeStyles")
- {
- CPPUNIT_FAIL("Unknown style family: " + rPair.first);
- }
- }
-}
-
#if 0
static void dumpRGBABitmap( const OUString& rPath, const unsigned char* pBuffer,
const int nWidth, const int nHeight )
--
2.12.0