Kaydet (Commit) 772d8c5a authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

disable asserts for some HTML export image properties values

The values are DPI dependent and the test fails if the system DPI
is set to anything else than 96.

Change-Id: I548a193b3c98dc5181539eca40064a52ec15efe7
üst 9bce4740
...@@ -203,13 +203,15 @@ DECLARE_HTMLEXPORT_TEST(testExportImageProperties, "HTMLImage.odt") ...@@ -203,13 +203,15 @@ DECLARE_HTMLEXPORT_TEST(testExportImageProperties, "HTMLImage.odt")
// //
// It would make sense to switch to use CSS and use "real world" units instead // It would make sense to switch to use CSS and use "real world" units instead
// i.e. (style="margin: 0cm 1.5cm; width: 1cm; height: 1cm") // i.e. (style="margin: 0cm 1.5cm; width: 1cm; height: 1cm")
#if !defined(MACOSX) && !defined(_WIN64)
#if 0 // disabled as it depends that the system DPI is set to 96
assertXPath(pDoc, "/html/body/p/a/font/img", "hspace", "38"); assertXPath(pDoc, "/html/body/p/a/font/img", "hspace", "38");
assertXPath(pDoc, "/html/body/p/a/font/img", "vspace", "19"); assertXPath(pDoc, "/html/body/p/a/font/img", "vspace", "19");
assertXPath(pDoc, "/html/body/p/a/font/img", "width", "222"); assertXPath(pDoc, "/html/body/p/a/font/img", "width", "222");
assertXPath(pDoc, "/html/body/p/a/font/img", "height", "222"); assertXPath(pDoc, "/html/body/p/a/font/img", "height", "222");
assertXPath(pDoc, "/html/body/p/a/font/img", "border", "3"); assertXPath(pDoc, "/html/body/p/a/font/img", "border", "3");
#endif #endif
assertXPath(pDoc, "/html/body/p/a/font/img", "usemap", "#map1"); assertXPath(pDoc, "/html/body/p/a/font/img", "usemap", "#map1");
} }
...@@ -237,7 +239,7 @@ DECLARE_HTMLEXPORT_TEST(testExportUrlEncoding, "tdf76291.odt") ...@@ -237,7 +239,7 @@ DECLARE_HTMLEXPORT_TEST(testExportUrlEncoding, "tdf76291.odt")
{ {
htmlDocPtr pDoc = parseHtml(maTempFile); htmlDocPtr pDoc = parseHtml(maTempFile);
CPPUNIT_ASSERT(pDoc); CPPUNIT_ASSERT(pDoc);
// Test URI encoded hyperlink with Chinese characters // Test URI encoded hyperlink with Chinese characters
assertXPath(pDoc, "/html/body/p/a", "href", "http://www.youtube.com/results?search_query=%E7%B2%B5%E8%AA%9Emv&sm=12"); assertXPath(pDoc, "/html/body/p/a", "href", "http://www.youtube.com/results?search_query=%E7%B2%B5%E8%AA%9Emv&sm=12");
} }
......
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