diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-03-26 23:55:56 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-26 23:58:44 +0100 |
| commit | 0b4712812fa78b5bbfb9313c36a14f46e1bc662d (patch) | |
| tree | 163a8123c38d51438d07941eb70ff651c0a6f356 /chart2/qa | |
| parent | 712daf33c826101a43e918d0a6285e21ac6e339a (diff) | |
enable the export validation for chart ODS tests
Don't even think about using the new skip flag for your shiny new test.
If you itnroduce tests that show validation errors fix them!!
Change-Id: I21bf61a113a35ca204a54d18246848a5788ae559
Diffstat (limited to 'chart2/qa')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 1 | ||||
| -rw-r--r-- | chart2/qa/extras/charttest.hxx | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index a817c59f0338..7697bab4cbe7 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -421,6 +421,7 @@ void Chart2ExportTest::testErrorBarXLSX() // in an export -> import cycle using different file formats - ODS, XLS and XLSX. void Chart2ExportTest::testTrendline() { + mbSkipValidation = true; load("/chart2/qa/extras/data/ods/", "trendline.ods"); checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); reload("calc8"); diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx index e9f0047fb43e..7a2b22c4d8ab 100644 --- a/chart2/qa/extras/charttest.hxx +++ b/chart2/qa/extras/charttest.hxx @@ -52,6 +52,7 @@ using namespace com::sun::star::uno; class ChartTest : public test::BootstrapFixture, public unotest::MacrosTest { public: + ChartTest():mbSkipValidation(false) {} void load( const OUString& rDir, const OUString& rFileName ); boost::shared_ptr<utl::TempFile> reload( const OUString& rFileName ); uno::Sequence < OUString > getImpressChartColumnDescriptions( const char* pDir, const char* pName ); @@ -65,6 +66,7 @@ public: protected: Reference< lang::XComponent > mxComponent; OUString maServiceName; + bool mbSkipValidation; // if you set this flag for a new test I'm going to haunt you! }; OUString ChartTest::getFileExtension( const OUString& aFileName ) @@ -112,7 +114,8 @@ boost::shared_ptr<utl::TempFile> ChartTest::reload(const OUString& rFilterName) } else if(rFilterName == "calc8") { - validate(pTempFile->GetFileName(), test::ODF); + if(!mbSkipValidation) + validate(pTempFile->GetFileName(), test::ODF); } CPPUNIT_ASSERT(mxComponent.is()); |