summaryrefslogtreecommitdiff
path: root/writerperfect/qa
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2015-12-17 13:16:29 +0100
committerDavid Tardon <dtardon@redhat.com>2015-12-17 23:03:15 +0100
commit71f92e9a6959b2b468aa4310633e4785d4bd0ea0 (patch)
tree9ee510bd9a8437d046e3aad819a3ba9dd7f1e267 /writerperfect/qa
parentddbba41b39399644b1ce7008d8922998446411e7 (diff)
do not require newest libetonyek for build
Change-Id: I6e023cd25a1481dd18e3a16b8756c43dde4560ce
Diffstat (limited to 'writerperfect/qa')
-rw-r--r--writerperfect/qa/unit/WpftCalcFilterTest.cxx7
-rw-r--r--writerperfect/qa/unit/WpftImportTestBase.hxx3
-rw-r--r--writerperfect/qa/unit/WpftImpressFilterTest.cxx9
-rw-r--r--writerperfect/qa/unit/WpftWriterFilterTest.cxx7
4 files changed, 23 insertions, 3 deletions
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index 40d1ace53b48..848f7e218f32 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -31,9 +31,14 @@ WpftCalcFilterTest::WpftCalcFilterTest()
void WpftCalcFilterTest::test()
{
+ const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
+ {
+ {"Numbers_2.numbers", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
+ };
+
doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", "/writerperfect/qa/unit/data/calc/libmwaw/");
doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter", "/writerperfect/qa/unit/data/calc/libwps/");
- doTest("org.libreoffice.comp.Calc.NumbersImportFilter", "/writerperfect/qa/unit/data/calc/libetonyek/");
+ doTest("org.libreoffice.comp.Calc.NumbersImportFilter", "/writerperfect/qa/unit/data/calc/libetonyek/", aEtonyekOptional);
}
CPPUNIT_TEST_SUITE_REGISTRATION(WpftCalcFilterTest);
diff --git a/writerperfect/qa/unit/WpftImportTestBase.hxx b/writerperfect/qa/unit/WpftImportTestBase.hxx
index 4689f9847dd5..1d83586ba045 100644
--- a/writerperfect/qa/unit/WpftImportTestBase.hxx
+++ b/writerperfect/qa/unit/WpftImportTestBase.hxx
@@ -29,6 +29,9 @@
((minor) > (req_minor) \
|| ((minor) == (req_minor) && ((micro) >= (req_micro)))))
+#define REQUIRE_ETONYEK_VERSION(major, minor, micro) \
+ REQUIRE_VERSION(ETONYEK_VERSION_MAJOR, ETONYEK_VERSION_MINOR, ETONYEK_VERSION_MICRO, major, minor, micro)
+
namespace com
{
namespace sun
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index 1b5590ac0456..ec16a116a455 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -31,7 +31,14 @@ WpftImpressFilterTest::WpftImpressFilterTest()
void WpftImpressFilterTest::test()
{
- doTest("org.libreoffice.comp.Impress.KeynoteImportFilter", "/writerperfect/qa/unit/data/impress/libetonyek/");
+ const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
+ {
+ {"v2.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1)},
+ {"v3.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1)},
+ {"v6.zip", REQUIRE_ETONYEK_VERSION(0, 1, 4)},
+ };
+
+ doTest("org.libreoffice.comp.Impress.KeynoteImportFilter", "/writerperfect/qa/unit/data/impress/libetonyek/", aEtonyekOptional);
doTest("com.sun.star.comp.Impress.MWAWPresentationImportFilter", "/writerperfect/qa/unit/data/impress/libmwaw/");
}
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index f8f9f8504bdc..a72b206f340b 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -31,11 +31,16 @@ WpftWriterFilterTest::WpftWriterFilterTest()
void WpftWriterFilterTest::test()
{
+ const writerperfect::test::WpftOptionalMap_t aEtonyekOptional
+ {
+ {"Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
+ };
+
doTest("com.sun.star.comp.Writer.AbiWordImportFilter", "/writerperfect/qa/unit/data/writer/libabw/");
doTest("org.libreoffice.comp.Writer.EBookImportFilter", "/writerperfect/qa/unit/data/writer/libe-book/");
doTest("com.sun.star.comp.Writer.MSWorksImportFilter", "/writerperfect/qa/unit/data/writer/libwps/");
doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/");
- doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/");
+ doTest("org.libreoffice.comp.Writer.PagesImportFilter", "/writerperfect/qa/unit/data/writer/libetonyek/", aEtonyekOptional);
doTest("com.sun.star.comp.Writer.WordPerfectImportFilter", "/writerperfect/qa/unit/data/writer/libwpd/");
}