summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-03-08 16:51:47 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-03-08 18:31:13 +0100
commit50532e3f63421f107e519242e58f03b90fdf3679 (patch)
tree102a56c58a7ca4921af31739c515529d1aba492a /test
parent25cd2f4bb4459c4195aaaf4ae0c89a61bd47e724 (diff)
enable ODF export validation
Change-Id: I09f517a49507a2eb31118f88f31dc2ff8b03de6a
Diffstat (limited to 'test')
-rw-r--r--test/source/bootstrapfixture.cxx12
1 files changed, 11 insertions, 1 deletions
diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index 137a284c53f3..a980731741bb 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -150,7 +150,9 @@ void test::BootstrapFixture::validate(const OUString& rPath, test::ValidationFor
aValidator = "officeotron ";
}
else
- return;
+ {
+ aValidator = "odfvalidator ";
+ }
utl::TempFile aOutput;
aOutput.EnableKillingFile();
@@ -184,6 +186,14 @@ void test::BootstrapFixture::validate(const OUString& rPath, test::ValidationFor
CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsg.getStr(), sal_Int32(0), nErrors);
}
}
+ else if( eFormat == test::ODF && !aContentOUString.isEmpty() )
+ {
+ if( aContentOUString.indexOf("Error") != -1 )
+ {
+ SAL_WARN("test", aContentOUString);
+ CPPUNIT_FAIL("validation errors during export");
+ }
+ }
#endif
}