Kaydet (Commit) 07b3ea26 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Carry fix over to CppunitTest_sw_dialogs_test_2

...from 2ec76e5d "Make sure swui's pSwResMgr is
initialized in CppunitTest_sw_dialogs_test", across ignorant
f888d171 "split sw screenshots test"

Change-Id: I096e22433317186e1a78855532f2c67bd842f366
üst 9f412fa7
......@@ -20,6 +20,7 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sw_dialogs_test2))
$(eval $(call gb_CppunitTest_set_include,sw_dialogs_test2,\
-I$(SRCDIR)/sw/source/ui/inc \
-I$(SRCDIR)/sw/inc \
-I$(SRCDIR)/sw/source/uibase/inc \
$$(INCLUDE) \
))
......
......@@ -9,17 +9,25 @@
#include <sal/config.h>
#include <test/screenshot_test.hxx>
#include <rtl/bootstrap.hxx>
#include <rtl/strbuf.hxx>
#include <osl/file.hxx>
#include <sfx2/app.hxx>
#include <vcl/abstdlg.hxx>
#include <swabstdlg.hxx>
using namespace ::com::sun::star;
extern "C" { using Fn = SwAbstractDialogFactory * (*)(); }
// sw/source/ui/dialog/swuiexp.cxx
/// Test opening a dialog in sw
class SwDialogsTest2 : public ScreenshotTest
{
private:
osl::Module libSwui_;
/// helper method to populate KnownDialogs, called in setUp(). Needs to be
/// written and has to add entries to KnownDialogs
virtual void registerKnownDialogsByID(mapType& rKnownDialogs) override;
......@@ -32,6 +40,8 @@ public:
SwDialogsTest2();
virtual ~SwDialogsTest2() override;
void setUp() override;
// try to open a dialog
void openAnyDialog();
......@@ -48,6 +58,22 @@ SwDialogsTest2::~SwDialogsTest2()
{
}
void SwDialogsTest2::setUp()
{
ScreenshotTest::setUp();
// Make sure the swui library's global pSwResMgr is initialized
// (alternatively to dynamically loading the library, SwCreateDialogFactory
// could be declared in an include file and this CppunitTest link against
// the swui library):
OUString url("${LO_LIB_DIR}/" SVLIBRARY("swui"));
rtl::Bootstrap::expandMacros(url); //TODO: detect failure
CPPUNIT_ASSERT(libSwui_.load(url, SAL_LOADMODULE_GLOBAL));
auto fn = reinterpret_cast<Fn>(
libSwui_.getFunctionSymbol("SwCreateDialogFactory"));
CPPUNIT_ASSERT(fn != nullptr);
(*fn)();
}
void SwDialogsTest2::registerKnownDialogsByID(mapType& /*rKnownDialogs*/)
{
// fill map of known dialogs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment