mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

emfplus: re-work and cleanup unit test

Browse Source 
Change-Id: I484331c4dd5feedf8587530912bb65556c1689c0
This commit is contained in:
Michael Meeks
2014-11-16 14:26:36 +01:00
parent 133c295bbe
commit 19866932cc
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cppcanvas/CppunitTest_cppcanvas_emfplus.mk
View File

@@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,cppcanvas_emfplus, \
cppuhelper \ cppuhelper \
sal \ sal \
sfx \ sfx \
subsequenttest \
test \ test \
tl \ tl \
unotest \ unotest \

19
cppcanvas/qa/extras/emfplus/emfplus.cxx
View File

@@ -15,18 +15,17 @@
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <sfx2/objsh.hxx> #include <sfx2/objsh.hxx>
#include <sfx2/sfxbasemodel.hxx> #include <sfx2/sfxbasemodel.hxx>
#include <test/bootstrapfixture.hxx> #include <test/unoapi_test.hxx>
#include <unotest/macros_test.hxx> #include <unotest/macros_test.hxx>
#include <vcl/bmpacc.hxx> #include <vcl/bmpacc.hxx>
#include <vcl/pngwrite.hxx> #include <vcl/pngwrite.hxx>
using namespace com::sun::star; using namespace com::sun::star;
class Test : public test::BootstrapFixture, public unotest::MacrosTest class Test : public UnoApiTest
{ {
public: public:
Test() Test() : UnoApiTest("/cppcanvas/qa/extras/emfplus/data/")
: mpTestDocumentPath("/cppcanvas/qa/extras/emfplus/data/")
{ {
} }
@@ -36,20 +35,25 @@ public:
virtual void setUp() SAL_OVERRIDE virtual void setUp() SAL_OVERRIDE
{ {
test::BootstrapFixture::setUp(); UnoApiTest::setUp();
mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory()))); mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
}; };
virtual void tearDown() SAL_OVERRIDE virtual void tearDown() SAL_OVERRIDE
{ {
if (mxComponent.is()) if (mxComponent.is())
{
closeDocument(mxComponent);
mxComponent->dispose(); mxComponent->dispose();
test::BootstrapFixture::tearDown(); }
UnoApiTest::tearDown();
}; };
Bitmap load(const char* pName) Bitmap load(const char* pName)
{ {
mxComponent = loadFromDesktop(getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(pName), "com.sun.star.drawing.DrawingDocument"); OUString aFileURL;
createFileURL(OUString::createFromAscii(pName), aFileURL);
mxComponent = loadFromDesktop(aFileURL, "com.sun.star.drawing.DrawingDocument");
SfxBaseModel* pModel = dynamic_cast<SfxBaseModel*>(mxComponent.get()); SfxBaseModel* pModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
CPPUNIT_ASSERT(pModel); CPPUNIT_ASSERT(pModel);
SfxObjectShell* pShell = pModel->GetObjectShell(); SfxObjectShell* pShell = pModel->GetObjectShell();
@@ -75,7 +79,6 @@ public:
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
uno::Reference<lang::XComponent> mxComponent; uno::Reference<lang::XComponent> mxComponent;
const char* mpTestDocumentPath;
}; };
void Test::testFdo77229() void Test::testFdo77229()