diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-29 10:24:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-29 10:24:26 +0100 |
| commit | 4092da68f5e71b3fb82382a8f3d31d2cd05289d7 (patch) | |
| tree | ff060104770edadf799a09e09ad5782f80949e97 /svl | |
| parent | c86c51a142301316f78db65ce8697da8d34fd9eb (diff) | |
CppunitTest_svl_urihelper needs the file UCP
...for the WNT-only file:///c:/... vs. file:///C:/... check in
testNormalizedMakeRelative
Change-Id: I66a0456589aabe395645bb358dbef3268e1c3816
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/CppunitTest_svl_urihelper.mk | 1 | ||||
| -rw-r--r-- | svl/Module_svl.mk | 6 | ||||
| -rw-r--r-- | svl/qa/unit/test_URIHelper.cxx | 12 |
3 files changed, 9 insertions, 10 deletions
diff --git a/svl/CppunitTest_svl_urihelper.mk b/svl/CppunitTest_svl_urihelper.mk index bb9cd05bee06..7b0f5ee90660 100644 --- a/svl/CppunitTest_svl_urihelper.mk +++ b/svl/CppunitTest_svl_urihelper.mk @@ -18,6 +18,7 @@ $(eval $(call gb_CppunitTest_use_api,svl_urihelper, \ $(eval $(call gb_CppunitTest_use_components,svl_urihelper, \ ucb/source/core/ucb1 \ + ucb/source/ucp/file/ucpfile1 \ )) $(eval $(call gb_CppunitTest_add_exception_objects,svl_urihelper, \ diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk index 3b11224b5dbb..18d79ab3cc85 100644 --- a/svl/Module_svl.mk +++ b/svl/Module_svl.mk @@ -36,14 +36,8 @@ $(eval $(call gb_Module_add_check_targets,svl,\ CppunitTest_svl_lngmisc \ CppunitTest_svl_notify \ CppunitTest_svl_qa_cppunit \ -)) - -#FIXME: fails on MSVC -ifneq ($(OS),WNT) -$(eval $(call gb_Module_add_check_targets,svl,\ CppunitTest_svl_urihelper \ )) -endif ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,svl,\ diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 00c9fae6f8c3..56cbad9c53ea 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -224,10 +224,14 @@ void Test::finish() { } void Test::testNormalizedMakeRelative() { - css::ucb::UniversalContentBroker::create(m_context)-> - registerContentProvider( - new Provider, OUString("test"), - true); + auto ucb(css::ucb::UniversalContentBroker::create(m_context)); + ucb->registerContentProvider(new Provider, "test", true); + ucb->registerContentProvider( + css::uno::Reference<css::ucb::XContentProvider>( + m_context->getServiceManager()->createInstanceWithContext( + "com.sun.star.comp.ucb.FileProvider", m_context), + css::uno::UNO_QUERY_THROW), + "file", true); struct Data { char const * base; char const * absolute; |