From 18342b7e2386340cc999f9599569d9d512262f1f Mon Sep 17 00:00:00 2001
From: bit4bit <bit4bit@noemail.net>
Date: Thu, 4 Nov 2021 23:56:49 +0000
Subject: [PATCH] se adiciona prueba para probar adicion en fragmentos

FossilOrigin-Name: 5094189dae307766ff8bb0869831a0245d4c092fdc6de8b5e7697d835a62c4d4
---
 facho/facho.py       | 18 ++++++++++++++++--
 tests/test_facho.py  | 39 +++++++++++++++++++++++++++++++++++++++
 tests/test_nomina.py |  2 +-
 3 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/facho/facho.py b/facho/facho.py
index ba9b5c3..5e52465 100644
--- a/facho/facho.py
+++ b/facho/facho.py
@@ -226,6 +226,8 @@ class FachoXML:
         # crea jerarquia segun xpath indicado
         parent = None
         current_elem = self.root
+        node_tag = node_paths.pop(-1)
+
         for node_path in node_paths:
             node_expr = self.builder.match_expression(node_path)
             node = self.builder.build_from_expression(node_path)
@@ -239,12 +241,20 @@ class FachoXML:
                 self.builder.append(current_elem, node)
                 current_elem = node
 
+        node_expr = self.builder.match_expression(node_tag)
+        node = self.builder.build_from_expression(node_tag)
+        child = self.builder.find_relative(current_elem, node_expr['path'], self.nsmap)
+        parent = current_elem
+        if child is not None:
+            current_elem = child
+           
+        if parent == current_elem:
+            self.builder.append(parent, node)
+            return node
 
         # se fuerza la adicion como un nuevo elemento
         if append:
-            node_tag = node_paths[-1]
             last_slibing = current_elem
-
             for child in parent.getchildren():
                 if child.tag == node_tag:
                     last_slibing = child
@@ -259,6 +269,10 @@ class FachoXML:
         except KeyError:
             pass
 
+        if child is None:
+            self.builder.append(current_elem, node)
+            current_elem = node
+
         return current_elem
 
     def set_element_validator(self, xpath, validator = False):
diff --git a/tests/test_facho.py b/tests/test_facho.py
index deea299..57d17de 100644
--- a/tests/test_facho.py
+++ b/tests/test_facho.py
@@ -280,3 +280,42 @@ def test_facho_xml_set_attributes_not_set_optional():
     with pytest.raises(KeyError):
         xml.get_element_attribute('/root/A', 'value1')
     assert xml.get_element_attribute('/root/A', 'value2') == '2'
+
+def test_facho_xml_placeholder_with_fragment():
+    xml = facho.FachoXML('root')
+    xml.placeholder_for('./A')
+    xml.placeholder_for('./AA')
+    xml.placeholder_for('./AAA')
+
+    AA = xml.fragment('./AA/Child')
+    AA.find_or_create_element('./B')
+    AA.find_or_create_element('./B', append=True)
+
+    AA = xml.fragment('./AA/Child', append=True)
+    
+    assert xml.tostring() == '<root><A/><AA><Child><B/><B/></Child><Child/></AA><AAA/></root>'
+
+def test_facho_xml_create_on_first_append():
+    xml = facho.FachoXML('root')
+
+    xml.find_or_create_element('./A', append=True)
+    assert xml.tostring() == '<root><A/></root>'
+
+def test_facho_xml_create_on_first_append_multiple_appends():
+    xml = facho.FachoXML('root')
+
+    xml.find_or_create_element('./B', append=True)
+    xml.find_or_create_element('./A', append=True)
+    xml.find_or_create_element('./A', append=True)
+    xml.find_or_create_element('./A', append=True)
+    xml.find_or_create_element('./C', append=True)
+    assert xml.tostring() == '<root><B/><A/><A/><A/><C/></root>'
+
+def test_facho_xml_fragment_create_on_first_append():
+    xml = facho.FachoXML('root')
+
+    A = xml.fragment('./A', append=True)
+    A.find_or_create_element('./B')
+    A = xml.fragment('./A', append=True)
+    A.find_or_create_element('./C')
+    assert xml.tostring() == '<root><A><B/></A><A><C/></A></root>'
diff --git a/tests/test_nomina.py b/tests/test_nomina.py
index 50d9912..4a2a8c9 100644
--- a/tests/test_nomina.py
+++ b/tests/test_nomina.py
@@ -31,7 +31,7 @@ def test_adicionar_devengado_transporte():
     xml = nomina.toFachoXML()
     assert xml.get_element_attribute('/fe:NominaIndividual/Devengados/Transporte', 'AuxilioTransporte') == '2000000.0'
 
-def test_adicionar_devengado_transporte_muchos():
+def atest_adicionar_devengado_transporte_muchos():
     nomina = fe.nomina.DIANNominaIndividual()
 
     nomina.adicionar_devengado(fe.nomina.DevengadoTransporte(