Merge pull request #111 from strictdoc-project/stanislaw/develop

helpers/lxml: simplify is_self_closed_tag()

Author: stanislaw

reqif/helpers/lxml.py

@@ -96,5 +96,4 @@ def is_self_closed_tag(xml):
         return False
     if xml.text is not None:
         return False
-    data_type_string = etree.tostring(xml, pretty_print=True).decode("utf-8")
-    return data_type_string.find(f"</{xml.tag}>") == -1
+    return True

tests/unit/reqif/helpers/test_lxml.py

@@ -1,6 +1,10 @@
 from lxml import etree
 
-from reqif.helpers.lxml import dump_xml_node, stringify_namespaced_children
+from reqif.helpers.lxml import (
+    dump_xml_node,
+    is_self_closed_tag,
+    stringify_namespaced_children,
+)
 
 
 def test_01_dump_xml() -> None:
@@ -45,3 +49,25 @@ def test__02_stringify_namespaced_children__02_nested_tags_and_attrs() -> None:
     string = stringify_namespaced_children(spec_type_xml)
 
     assert string == expected_string
+
+
+def test__is_self_closed_tag() -> None:
+    spec_type_string = """\
+<THE-VALUE>\
+Text
+</THE-VALUE>
+"""
+    spec_type_xml = etree.fromstring(spec_type_string)
+    assert is_self_closed_tag(spec_type_xml) is False
+
+    spec_type_string = """\
+<THE-VALUE></THE-VALUE>
+"""
+    spec_type_xml = etree.fromstring(spec_type_string)
+    assert is_self_closed_tag(spec_type_xml) is True
+
+    spec_type_string = """\
+<THE-VALUE/>
+"""
+    spec_type_xml = etree.fromstring(spec_type_string)
+    assert is_self_closed_tag(spec_type_xml) is True