[Libreoffice-commits] core.git: chart2/qa

[Vasily Melenchuk]

 chart2/qa/extras/chart2export.cxx |    1 +
 chart2/qa/extras/charttest.hxx    |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit a553fa42f30e794541d1218435b478c620b03d9a
Author: Vasily Melenchuk <vasily.melenchuk at cib.de>
Date:   Tue Jun 21 16:57:55 2016 +0300

    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 at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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");
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;
 }