diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-13 05:42:28 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-07-12 03:10:11 +0200 |
| commit | 22d863454cbe90a7eb164914581ca1524fad4889 (patch) | |
| tree | b3ba0ba15cf49dd781e4c69d2d12a22658268670 /sd | |
| parent | f5dbe0eaba923f5de84745a04f531b36c979cafa (diff) | |
testing odp files makes much more sense
Change-Id: I4023855513016e7f9d850bf96815539696536552
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/CppunitTest_sd_regression_test.mk | 1 | ||||
| -rw-r--r-- | sd/Module_sd.mk | 2 | ||||
| -rw-r--r-- | sd/qa/unit/regression-test.cxx | 8 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index 22d049e1e2da..485e851b9e0d 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -114,6 +114,7 @@ $(eval $(call gb_CppunitTest_use_components,sd_regression_test,\ unotools/util/utl \ unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ + xmloff/util/xo \ xmlsecurity/util/xsec_fw \ xmlsecurity/util/xmlsecurity \ )) diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index af2809a7a20c..60217f520f5d 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Module_add_targets,sd,\ ifneq ($(OS),DRAGONFLY) $(eval $(call gb_Module_add_check_targets,sd,\ - CppunitTest_sd_uimpress \ - CppunitTest_sd_filters_test \ CppunitTest_sd_regression_test \ )) endif diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx index cf39d2cb0811..169b891d5d91 100644 --- a/sd/qa/unit/regression-test.cxx +++ b/sd/qa/unit/regression-test.cxx @@ -122,6 +122,7 @@ private: }; #define PPTX_FORMAT_TYPE 268959811 +#define ODP_FORMAT_TYPE 285212967 struct FileFormat { const char* pName; const char* pFilterName; const char* pTypeName; sal_uLong nFormatType; @@ -130,6 +131,7 @@ struct FileFormat { // cf. sc/qa/unit/filters-test.cxx and filters/...*.xcu to fill out. FileFormat aFileFormats[] = { { "pptx" , "Impress MS PowerPoint 2007 XML", "MS PowerPoint 2007 XML", PPTX_FORMAT_TYPE }, + { "odp" , "impress8", "impress8", ODP_FORMAT_TYPE }, { 0, 0, 0, 0 } }; @@ -153,7 +155,7 @@ FileFormat aFileFormats[] = { rtl::OUString(), pFmt->nFormatType, nFormat, rtl::OUString::createFromAscii( pFmt->pTypeName ), 0, rtl::OUString(), rtl::OUString(), /* userdata */ - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/sdraw*")) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/simpress*")) ); aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT); ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell(); @@ -171,7 +173,7 @@ FileFormat aFileFormats[] = { void SdFiltersTest::test() { - ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/a.pptx")); + ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/odp/test.odp")); CPPUNIT_ASSERT_MESSAGE( "failed to load", xDocShRef.Is() ); CPPUNIT_ASSERT_MESSAGE( "not in destruction", !xDocShRef->IsInDestruction() ); @@ -194,6 +196,8 @@ void SdFiltersTest::test() std::cout << aString << std::endl; } xDocShRef->DoClose(); + + CPPUNIT_ASSERT(false); } bool SdFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL, |