commit a553fa42f30e794541d1218435b478c620b03d9a
author Vasily Melenchuk <vasily.melenchuk@cib.de> Tue Jun 21 16:57:55 2016 +0300
committer Thorsten Behrens <Thorsten.Behrens@CIB.de> Thu Jun 23 02:08:58 2016 +0000
tree d470df8bd397470ebd47e655e634f5a93d01baba
parent 8456d83ed928c9c14b833393d5e15f64e394a3b1

support for ms binary format validation in chart2 module export tests

Validation is done with Microsoft Office Binary File Format Validator if it
is enabled. However binary files are failing validation, so validation is
disbled in corresponding tests.

Change-Id: I9f6ff5c3dd9e3e3c0bb37ce895e60e38a0b43e9a
Reviewed-on: https://gerrit.libreoffice.org/26510
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

chart2/qa/extras/chart2export.cxx

diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index 0279583..a10e8a8 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -468,6 +468,7 @@ void Chart2ExportTest::testTrendlineOOXML()

void Chart2ExportTest::testTrendlineXLS()
{
    mbSkipValidation = true;
    load("/chart2/qa/extras/data/ods/", "trendline.ods");
    checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
    reload("MS Excel 97");

chart2/qa/extras/charttest.hxx

diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 9c174cf..6f94432 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -150,7 +150,11 @@ std::shared_ptr<utl::TempFile> ChartTest::reload(const OUString& rFilterName)
        if(!mbSkipValidation)
            validate(pTempFile->GetFileName(), test::ODF);
    }

    else if(rFilterName == "MS Excel 97")
    {
        if(!mbSkipValidation)
            validate(pTempFile->GetFileName(), test::MSBINARY);
    }
    CPPUNIT_ASSERT(mxComponent.is());
    return pTempFile;
}