modified to use pytest

app/scodoc/sco_xml.py

@@ -71,11 +71,14 @@ def simple_dictlist2xml(dictlist, tagname=None, quote=False, pretty=True):
     if pretty:
         # solution peu satisfaisante car on doit reparser le XML
         # de plus, on encode/decode pour avoir le tag <?xml version="1.0" encoding="utf-8"?>
+        try:
             ans = (
                 minidom.parseString(ans)
                 .toprettyxml(indent="\t", encoding="utf-8")
                 .decode("utf-8")
             )
+        except xml.parsers.expat.ExpatError:
+            pass
     return ans
 
 

tests/unit/test_export_xml.py

@@ -2,21 +2,18 @@
 
 """Unit tests for XML exports
 
-Usage: python -m unittest tests.test_export_xml
+Usage: pytest tests/unit/test_export_xml.py
 """
 
 # ScoDoc7 utilisait jaxml, obsolete et non portée en python3
-# On teste ici les fionctions de remplacement, fournies par
+# On teste ici les fonctions de remplacement, fournies par
 # notre nouveau module sco_xml.py
 
-from __future__ import print_function
 import os
 import re
 import sys
 import unittest
 
-sys.path.append("/mac/ScoDoc")
-
 from app.scodoc import sco_xml
 from app.scodoc.gen_tables import GenTable
 
@@ -36,73 +33,75 @@ def xmls_compare(x, y):
     return xml_normalize(x) == xml_normalize(y)
 
 
-# expected_result est le résultat de l'ancienne fonction ScoDoc7:
+def test_export_xml(test_client):
-for (data, expected_result) in (
+    """exports XML compatibles ScoDoc 7"""
+    # expected_result est le résultat de l'ancienne fonction ScoDoc7:
+    for (data, expected_result) in (
         (
             [{"id": 1, "ues": [{"note": 10}, {}, {"valeur": 25}]}, {"bis": 2}],
             """<?xml version="1.0" encoding="utf-8"?>
-<infos id="1">
+    <infos id="1">
         <ues note="10" />
         <ues />
         <ues valeur="25" />
-</infos>
+    </infos>
-<infos bis="2" />
+    <infos bis="2" />
-""",
+    """,
         ),
         ([], """"""),
         (
             ["allo"],
             """<?xml version="1.0" encoding="utf-8"?>
-<infos code="allo" />
+    <infos code="allo" />
-""",
+    """,
         ),
         (
             [{}],
             """<?xml version="1.0" encoding="utf-8"?>
-<infos />
+    <infos />
-""",
+    """,
         ),
         (
             [{"x": 1}],
             """<?xml version="1.0" encoding="utf-8"?>
-<infos x="1" />
+    <infos x="1" />
-""",
+    """,
         ),
         (
             [{"y": [1, 2, 3], "x": 1}],
             """<?xml version="1.0" encoding="utf-8"?>
-<infos x="1">
+    <infos x="1">
         <y code="1" />
         <y code="2" />
         <y code="3" />
-</infos>
+    </infos>
-""",
+    """,
         ),
         (
             [{"y": [{"x": 1}, {"y": [1, 2, 3]}], "x": 1}],
             """<?xml version="1.0" encoding="utf-8"?>
-<infos x="1">
+    <infos x="1">
         <y x="1" />
         <y>
             <y code="1" />
             <y code="2" />
             <y code="3" />
         </y>
-</infos>
+    </infos>
-""",
+    """,
         ),
-):
+    ):
         # x = scu.simple_dictlist2xml(data, tagname="infos")
         y = sco_xml.simple_dictlist2xml(data, tagname="infos")
         assert xmls_compare(expected_result, y)
         # print("""({}, '''{}'''),""".format(data, str(x)))
 
-# test du sendXML compatible ScoDoc7
+    # test du sendXML compatible ScoDoc7
-etuds = [{"x": 1, "etuds": ["allo", "mama"]}, {"x": 2, "etuds": ["un", "deux"]}]
+    etuds = [{"x": 1, "etuds": ["allo", "mama"]}, {"x": 2, "etuds": ["un", "deux"]}]
-# Le résultat de l'ancien print(sendXML(None, etuds, tagname="etudiants"))
+    # Le résultat de l'ancien print(sendXML(None, etuds, tagname="etudiants"))
-expected_result = """
+    expected_result = """
-<?xml version="1.0" encoding="utf-8"?>
+    <?xml version="1.0" encoding="utf-8"?>
-<etudiants_list>
+    <etudiants_list>
         <etudiants x="1">
             <etuds code="allo" />
             <etuds code="mama" />
@@ -111,24 +110,24 @@ expected_result = """
             <etuds code="un" />
             <etuds code="deux" />
         </etudiants>
-</etudiants_list>
+    </etudiants_list>
-"""
+    """
 
-assert xmls_compare(
+    assert xmls_compare(
         expected_result,
         sco_xml.simple_dictlist2xml([{"etudiant": etuds}], tagname="etudiant_list"),
-)
+    )
 
-# ---- Tables
+    # ---- Tables
-T = GenTable(
+    table = GenTable(
         rows=[{"nom": "Toto", "age": 26}, {"nom": "Titi", "age": 21}],
         columns_ids=("nom", "age"),
-)
+    )
-print(T.xml())
+    table_xml = table.xml()
 
-expected_result = """
+    expected_result = """
-<?xml version="1.0" encoding="utf-8"?>
+    <?xml version="1.0" encoding="utf-8"?>
-<table origin="" caption="" id="gt_806883">
+    <table origin="" caption="" id="gt_806883">
         <row>
             <nom value="Toto" />
             <age value="26" />
@@ -137,5 +136,6 @@ expected_result = """
             <nom value="Titi" />
             <age value="21" />
         </row>
-</table>
+    </table>
-"""
+    """
+    assert xmls_compare(table_xml, expected_result)