Kaydet (Commit) 74c8d4a8 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

sw htmlexport: Consistent naming in the test.

Change-Id: I608b818063f3ac66c6b36f9f8d221a54bfe1be24
üst c15c9346
...@@ -44,7 +44,7 @@ private: ...@@ -44,7 +44,7 @@ private:
virtual std::unique_ptr<Resetter> preTest(const char* filename) override virtual std::unique_ptr<Resetter> preTest(const char* filename) override
{ {
if (getTestName().indexOf("SkipImage") != -1) if (getTestName().indexOf("SkipImages") != -1)
setFilterOptions("SkipImages"); setFilterOptions("SkipImages");
else else
setFilterOptions(""); setFilterOptions("");
...@@ -138,7 +138,7 @@ DECLARE_HTMLEXPORT_TEST(testExportOfImages, "textAndImage.docx") ...@@ -138,7 +138,7 @@ DECLARE_HTMLEXPORT_TEST(testExportOfImages, "textAndImage.docx")
assertXPath(pDoc, "/html/body/p/img", 1); assertXPath(pDoc, "/html/body/p/img", 1);
} }
DECLARE_HTMLEXPORT_TEST(testExportOfImagesWithSkipImageEnabled, "textAndImage.docx") DECLARE_HTMLEXPORT_TEST(testExportOfImagesWithSkipImagesEnabled, "textAndImage.docx")
{ {
htmlDocPtr pDoc = parseHtml(maTempFile); htmlDocPtr pDoc = parseHtml(maTempFile);
CPPUNIT_ASSERT(pDoc); CPPUNIT_ASSERT(pDoc);
...@@ -147,7 +147,7 @@ DECLARE_HTMLEXPORT_TEST(testExportOfImagesWithSkipImageEnabled, "textAndImage.do ...@@ -147,7 +147,7 @@ DECLARE_HTMLEXPORT_TEST(testExportOfImagesWithSkipImageEnabled, "textAndImage.do
assertXPath(pDoc, "/html/body/p/img", 0); assertXPath(pDoc, "/html/body/p/img", 0);
} }
DECLARE_HTMLEXPORT_TEST(testSkipImageEmbedded, "skipimage-embedded.doc") DECLARE_HTMLEXPORT_TEST(testSkipImagesEmbedded, "skipimage-embedded.doc")
{ {
// Embedded spreadsheet was exported as image, so content was lost. Make // Embedded spreadsheet was exported as image, so content was lost. Make
// sure it's exported as HTML instead. // sure it's exported as HTML instead.
...@@ -162,9 +162,9 @@ DECLARE_HTMLEXPORT_TEST(testSkipImageEmbedded, "skipimage-embedded.doc") ...@@ -162,9 +162,9 @@ DECLARE_HTMLEXPORT_TEST(testSkipImageEmbedded, "skipimage-embedded.doc")
assertXPath(pDoc, "//span/table", 1); assertXPath(pDoc, "//span/table", 1);
} }
DECLARE_HTMLEXPORT_TEST(testSkipImageEmbeddedDocument, "skipimage-embedded-document.docx") DECLARE_HTMLEXPORT_TEST(testSkipImagesEmbeddedDocument, "skipimage-embedded-document.docx")
{ {
// Similar to testSkipImageEmbedded, but with an embedded Writer object, // Similar to testSkipImagesEmbedded, but with an embedded Writer object,
// not a Calc one, and this time OOXML, not WW8. // not a Calc one, and this time OOXML, not WW8.
htmlDocPtr pDoc = parseHtml(maTempFile); htmlDocPtr pDoc = parseHtml(maTempFile);
CPPUNIT_ASSERT(pDoc); CPPUNIT_ASSERT(pDoc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment