Fixing tests

py-pdf · Jun 30, 2022 · 9538443 · 9538443
1 parent 97e6cfc
commit 9538443
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 17 deletions.
diff --git a/fpdf/syntax.py b/fpdf/syntax.py
@@ -235,7 +235,11 @@ def camel_case(snake_case):
 
 class PDFString(str):
     USE_HEX_ENCODING = True
-    "Setting this to False can reduce the encoded strings size, but then there can be a risk of badly encoding some unicode strings - cf. issue #458"
+    """
+    Setting this to False can reduce the encoded strings size,
+    but then there can be a risk of badly encoding some unicode strings - cf. issue #458
+    """
+
     def serialize(self):
         if self.USE_HEX_ENCODING:
             # Using the "Hexadecimal String" format defined in the PDF spec:

diff --git a/test/html/html_custom_heading_sizes.pdf b/test/html/html_custom_heading_sizes.pdf
diff --git a/test/html/html_features.pdf b/test/html/html_features.pdf
diff --git a/test/html/html_heading_hebrew.pdf b/test/html/html_heading_hebrew.pdf
diff --git a/test/html/html_headings_line_height.pdf b/test/html/html_headings_line_height.pdf
diff --git a/test/image/alt_text/alt_text_and_title.pdf b/test/image/alt_text/alt_text_and_title.pdf
diff --git a/test/image/alt_text/test_alt_text_on_two_pages.pdf b/test/image/alt_text/test_alt_text_on_two_pages.pdf
diff --git a/test/link_alt_text.pdf b/test/link_alt_text.pdf
diff --git a/test/outline/custom_HTML2FPDF.pdf b/test/outline/custom_HTML2FPDF.pdf
diff --git a/test/outline/html_toc.pdf b/test/outline/html_toc.pdf
diff --git a/test/outline/html_toc_2_pages.pdf b/test/outline/html_toc_2_pages.pdf
diff --git a/test/outline/html_toc_with_h1_as_2nd_heading.pdf b/test/outline/html_toc_with_h1_as_2nd_heading.pdf
diff --git a/test/outline/test_outline_serializer.py b/test/outline/test_outline_serializer.py
@@ -1,5 +1,5 @@
 from fpdf.outline import OutlineSection, serialize_outline
-from fpdf.syntax import DestinationXYZ
+from fpdf.syntax import DestinationXYZ, PDFString
 
 
 def test_serialize_outline():
@@ -18,7 +18,7 @@ def test_serialize_outline():
     )
     assert (
         serialize_outline(sections, first_object_id=6)
-        == f"""\
+        == """\
 6 0 obj
 <<
 /Count 2
@@ -35,15 +35,15 @@ def test_serialize_outline():
 /Last 8 0 R
 /Next 9 0 R
 /Parent 6 0 R
-/Title ({'Title 1'.encode('UTF-16').decode('latin-1')})
+/Title <feff005400690074006c006500200031>
 >>
 endobj
 8 0 obj
 <<
 /Count 0
 /Dest [5 0 R /XYZ 0 0 null]
 /Parent 7 0 R
-/Title ({'Subtitle 1.1'.encode('UTF-16').decode('latin-1')})
+/Title <feff005300750062007400690074006c006500200031002e0031>
 >>
 endobj
 9 0 obj
@@ -54,7 +54,7 @@ def test_serialize_outline():
 /Last 11 0 R
 /Parent 6 0 R
 /Prev 7 0 R
-/Title ({'Title 2'.encode('UTF-16').decode('latin-1')})
+/Title <feff005400690074006c006500200032>
 >>
 endobj
 10 0 obj
@@ -63,7 +63,7 @@ def test_serialize_outline():
 /Dest [9 0 R /XYZ 0 0 null]
 /Next 11 0 R
 /Parent 9 0 R
-/Title ({'Subtitle 2.1'.encode('UTF-16').decode('latin-1')})
+/Title <feff005300750062007400690074006c006500200032002e0031>
 >>
 endobj
 11 0 obj
@@ -72,7 +72,7 @@ def test_serialize_outline():
 /Dest [11 0 R /XYZ 0 0 null]
 /Parent 9 0 R
 /Prev 10 0 R
-/Title ({'Subtitle 2.2'.encode('UTF-16').decode('latin-1')})
+/Title <feff005300750062007400690074006c006500200032002e0032>
 >>
 endobj"""
     )
@@ -88,7 +88,7 @@ def test_serialize_outline_with_headless_hierarchy():  # issues 239
     )
     assert (
         serialize_outline(sections, first_object_id=6)
-        == f"""\
+        == """\
 6 0 obj
 <<
 /Count 2
@@ -104,15 +104,15 @@ def test_serialize_outline_with_headless_hierarchy():  # issues 239
 /First 8 0 R
 /Last 8 0 R
 /Parent 6 0 R
-/Title ({'?-1'.encode('UTF-16').decode('latin-1')})
+/Title <feff003f002d0031>
 >>
 endobj
 8 0 obj
 <<
 /Count 0
 /Dest [5 0 R /XYZ 0 0 null]
 /Parent 7 0 R
-/Title ({'?-1-1'.encode('UTF-16').decode('latin-1')})
+/Title <feff003f002d0031002d0031>
 >>
 endobj
 9 0 obj
@@ -122,7 +122,7 @@ def test_serialize_outline_with_headless_hierarchy():  # issues 239
 /First 10 0 R
 /Last 10 0 R
 /Parent 6 0 R
-/Title ({'1'.encode('UTF-16').decode('latin-1')})
+/Title <feff0031>
 >>
 endobj
 10 0 obj
@@ -132,15 +132,47 @@ def test_serialize_outline_with_headless_hierarchy():  # issues 239
 /First 11 0 R
 /Last 11 0 R
 /Parent 9 0 R
-/Title ({'1-1'.encode('UTF-16').decode('latin-1')})
+/Title <feff0031002d0031>
 >>
 endobj
 11 0 obj
 <<
 /Count 0
 /Dest [5 0 R /XYZ 0 0 null]
 /Parent 10 0 R
-/Title ({'1-1-1'.encode('UTF-16').decode('latin-1')})
+/Title <feff0031002d0031002d0031>
 >>
 endobj"""
     )
+
+
+def test_serialize_outline_without_hex_encoding():  # issue-458
+    PDFString.USE_HEX_ENCODING = False
+    try:
+        sections = (
+            OutlineSection(
+                "Title", level=0, page_number=1, dest=DestinationXYZ(page=1)
+            ),
+        )
+        assert (
+            serialize_outline(sections, first_object_id=1)
+            == f"""\
+1 0 obj
+<<
+/Count 1
+/First 2 0 R
+/Last 2 0 R
+/Type /Outlines
+>>
+endobj
+2 0 obj
+<<
+/Count 0
+/Dest [3 0 R /XYZ 0 0 null]
+/Parent 1 0 R
+/Title ({'Title'.encode('UTF-16').decode('latin-1')})
+>>
+endobj"""
+        )
+    finally:
+        PDFString.USE_HEX_ENCODING = True  # restore default value
diff --git a/test/test_structure_tree.py b/test/test_structure_tree.py
@@ -83,7 +83,7 @@ def test_single_image_structure_tree():
     )
     assert (
         struct_builder.serialize(first_object_id=3)
-        == f"""\
+        == """\
 3 0 obj
 <<
 /K [4 0 R]
@@ -106,12 +106,12 @@ def test_single_image_structure_tree():
 endobj
 6 0 obj
 <<
-/Alt ({'Image description'.encode('UTF-16').decode('latin-1')})
+/Alt <feff0049006d0061006700650020006400650073006300720069007000740069006f006e>
 /K [0]
 /P 4 0 R
 /Pg 1 0 R
 /S /Figure
-/T ({'Image title'.encode('UTF-16').decode('latin-1')})
+/T <feff0049006d0061006700650020007400690074006c0065>
 /Type /StructElem
 >>
 endobj"""