summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2016-06-17 10:36:38 +0300
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2016-06-17 11:20:06 +0000
commitc3453ea24608123195588ea910b8db7b13922054 (patch)
treed1bada1fe15b448bfe95884be52ccc925ef41be5
parent27bd030aa033565dfdff56c298c797c80cee5160 (diff)
Add MS binary format validator support in test fixture
bffvalidator (Microsoft Office Binary File Format Validator) can now be used for verification of MS binary export tests Change-Id: Ibc65e64726a454cdd33946006b36427b9cc6fbd2 Reviewed-on: https://gerrit.libreoffice.org/26405 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--include/test/bootstrapfixture.hxx3
-rw-r--r--test/source/bootstrapfixture.cxx11
2 files changed, 12 insertions, 2 deletions
diff --git a/include/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx
index 448605a8dc1d..5e24753fe668 100644
--- a/include/test/bootstrapfixture.hxx
+++ b/include/test/bootstrapfixture.hxx
@@ -30,7 +30,8 @@ namespace test {
enum ValidationFormat
{
OOXML,
- ODF
+ ODF,
+ MSBINARY
};
// Class to do lots of heavy-lifting UNO & environment
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index f274dbce571f..c28615dc7719 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -173,10 +173,19 @@ void test::BootstrapFixture::validate(const OUString& rPath, test::ValidationFor
{
var = "OFFICEOTRON";
}
- else
+ else if ( eFormat == test::ODF )
{
var = "ODFVALIDATOR";
}
+ else if ( eFormat == test::MSBINARY )
+ {
+#if HAVE_BFFVALIDATOR
+ var = "BFFVALIDATOR";
+#else
+ // Binary Format Validator is disabled
+ return;
+#endif
+ }
OUString aValidator;
oslProcessError e = osl_getEnvironment(var.pData, &aValidator.pData);
CPPUNIT_ASSERT_EQUAL_MESSAGE(