From aadac3c8911300676333596f8428532dd43d461f Mon Sep 17 00:00:00 2001 From: "laptop1\\Andrew" Date: Sat, 24 Feb 2018 00:25:05 +0800 Subject: Docx test: adjust test for fix of bug This commit adjusts the test cases for the Docx writer after the fix of #3930. - Adjusted test cases with inline images. The inline images now have the correct sizing, title and description. - Modified the test case to include an image multiple times with different sizing each time. - Tested on Windows 8.1 with Word 2007 (12.0.6705.5000) The files are not corrupted and display exactly what is expected. --- test/docx/golden/image.docx | Bin 26296 -> 26452 bytes test/docx/golden/inline_images.docx | Bin 26460 -> 26506 bytes test/docx/image_writer_test.native | 13 ++++++++----- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/docx/golden/image.docx b/test/docx/golden/image.docx index dc49f266b..95a28a098 100644 Binary files a/test/docx/golden/image.docx and b/test/docx/golden/image.docx differ diff --git a/test/docx/golden/inline_images.docx b/test/docx/golden/inline_images.docx index 6bd4b3a34..62c5943ba 100644 Binary files a/test/docx/golden/inline_images.docx and b/test/docx/golden/inline_images.docx differ diff --git a/test/docx/image_writer_test.native b/test/docx/image_writer_test.native index a568cbca0..a0fb3ee3a 100644 --- a/test/docx/image_writer_test.native +++ b/test/docx/image_writer_test.native @@ -1,5 +1,8 @@ -Pandoc (Meta {unMeta = fromList []}) -[Para [Image ("",[],[]) [] ("lalune.jpg","")] -,Para [Image ("",[],[]) [Str "The",Space,Str "Moon"] ("lalune.jpg","fig:")] -,Header 1 ("one-more",[],[]) [Str "One",Space,Str "More"] -,Para [Image ("",[],[]) [Str "The",Space,Str "Moon"] ("lalune.jpg","fig:")]] \ No newline at end of file +[Para [Str "No",Space,Str "width",Space,Str "given:"] +,Para [Image ("",[],[]) [Str "testimg"] ("lalune.jpg","fig:")] +,Para [Str "With",Space,Str "height",Space,Str "10cm:"] +,Para [Image ("",[],[("height","10cm")]) [Str "2testimg"] ("lalune.jpg","fig:")] +,Para [Str "With",Space,Str "width",Space,Str "6cm:"] +,Para [Image ("",[],[("width","6cm")]) [Str "3testimg"] ("lalune.jpg","fig:")] +,Header 1 ("with-height-3in-and-width-6in",[],[]) [Str "With",Space,Str "height",Space,Str "3in",Space,Str "and",Space,Str "width",Space,Str "6in:"] +,Para [Image ("",[],[("width","6in"),("height","3in")]) [Str "4testimg"] ("lalune.jpg","fig:")]] \ No newline at end of file -- cgit v1.2.3