Kaydet (Commit) cb088e6d authored tarafından Miklos Vajna's avatar Miklos Vajna

sw_filters_test: add support for ooxml files

The motivation is that if -- after fixing a crash -- the document looks
OK, then all the paperwork in the ooxmlimport isn't necessary, just drop
in the file to qa/core/data/ooxml/pass/, and we're done.

Change-Id: I2287189bd3c49c5e53489f9d89a6341685359b33
üst bb0a43fe
...@@ -58,12 +58,15 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ ...@@ -58,12 +58,15 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
configmgr/source/configmgr \ configmgr/source/configmgr \
dbaccess/util/dba \ dbaccess/util/dba \
fileaccess/source/fileacc \ fileaccess/source/fileacc \
filter/source/config/cache/filterconfig1 \
forms/util/frm \ forms/util/frm \
framework/util/fwk \ framework/util/fwk \
i18npool/util/i18npool \ i18npool/util/i18npool \
oox/util/oox \
package/source/xstor/xstor \ package/source/xstor/xstor \
package/util/package2 \ package/util/package2 \
sax/source/expatwrap/expwrap \ sax/source/expatwrap/expwrap \
sax/source/fastparser/fastsax \
sfx2/util/sfx \ sfx2/util/sfx \
svtools/util/svt \ svtools/util/svt \
sw/util/msword \ sw/util/msword \
...@@ -71,7 +74,9 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ ...@@ -71,7 +74,9 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
toolkit/util/tk \ toolkit/util/tk \
ucb/source/core/ucb1 \ ucb/source/core/ucb1 \
ucb/source/ucp/file/ucpfile1 \ ucb/source/ucp/file/ucpfile1 \
unotools/util/utl \
unoxml/source/service/unoxml \ unoxml/source/service/unoxml \
writerfilter/util/writerfilter \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
xmloff/source/transform/xof \ xmloff/source/transform/xof \
xmloff/util/xo \ xmloff/util/xo \
...@@ -79,4 +84,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ ...@@ -79,4 +84,6 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
$(eval $(call gb_CppunitTest_use_configuration,sw_filters_test)) $(eval $(call gb_CppunitTest_use_configuration,sw_filters_test))
$(eval $(call gb_CppunitTest_use_filter_configuration,sw_filters_test))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -107,6 +107,11 @@ void SwFiltersTest::testCVEs() ...@@ -107,6 +107,11 @@ void SwFiltersTest::testCVEs()
testDir(OUString("Text (encoded)"), testDir(OUString("Text (encoded)"),
getURLFromSrc("/sw/qa/core/data/txt/"), getURLFromSrc("/sw/qa/core/data/txt/"),
OUString(FILTER_TEXT_DLG)); OUString(FILTER_TEXT_DLG));
testDir(OUString("MS Word 2007 XML"),
getURLFromSrc("/sw/qa/core/data/ooxml/"),
OUString(),
SFX_FILTER_STARONEFILTER);
} }
void SwFiltersTest::setUp() void SwFiltersTest::setUp()
......
...@@ -77,7 +77,7 @@ public: ...@@ -77,7 +77,7 @@ public:
void testN778140(); void testN778140();
void testN778828(); void testN778828();
void testInk(); void testInk();
void testNoCrash(); void testN779834();
void testN779627(); void testN779627();
void testN779941(); void testN779941();
void testFdo55187(); void testFdo55187();
...@@ -157,7 +157,7 @@ void Test::run() ...@@ -157,7 +157,7 @@ void Test::run()
{"n778140.docx", &Test::testN778140}, {"n778140.docx", &Test::testN778140},
{"n778828.docx", &Test::testN778828}, {"n778828.docx", &Test::testN778828},
{"ink.docx", &Test::testInk}, {"ink.docx", &Test::testInk},
{"n779834.docx", &Test::testNoCrash}, {"n779834.docx", &Test::testN779834},
{"n779627.docx", &Test::testN779627}, {"n779627.docx", &Test::testN779627},
{"n779941.docx", &Test::testN779941}, {"n779941.docx", &Test::testN779941},
{"fdo55187.docx", &Test::testFdo55187}, {"fdo55187.docx", &Test::testFdo55187},
...@@ -191,7 +191,6 @@ void Test::run() ...@@ -191,7 +191,6 @@ void Test::run()
{"n592908-frame.docx", &Test::testN592908_Frame}, {"n592908-frame.docx", &Test::testN592908_Frame},
{"n592908-picture.docx", &Test::testN592908_Picture}, {"n592908-picture.docx", &Test::testN592908_Picture},
{"n779630.docx", &Test::testN779630}, {"n779630.docx", &Test::testN779630},
{"fdo64256.docx", &Test::testNoCrash},
}; };
header(); header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i) for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
...@@ -879,9 +878,9 @@ void Test::testInk() ...@@ -879,9 +878,9 @@ void Test::testInk()
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.drawing.OpenBezierShape")); CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.drawing.OpenBezierShape"));
} }
void Test::testNoCrash() void Test::testN779834()
{ {
// These documents simply crashed the importer. // This document simply crashed the importer.
} }
void Test::testN779627() void Test::testN779627()
......
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