Changeset 4539

Timestamp:

04/21/09 23:17:33 (4 years ago)

Author:

getxsick

Message:

fixed #307 - multiple loading of XML

Location:

branch/UMPA

Files:

• tests/unit/test_extensions/test_xml.py (modified) (1 diff)
• umpa/extensions/XML.py (modified) (2 diffs)

branch/UMPA/tests/unit/test_extensions/test_xml.py

@@ -258 +258 @@
 
     def test_xml_load(self):
-        def load(text):
-            f = StringIO()
-            f.write(text)
-            f.seek(0)
-
-            packets = XML.load(f)
-            for p in packets:
-                for i, proto in enumerate(p.protos):
-                    for fieldname in proto.get_fields_keys():
-                        assert proto.get_field(fieldname).fillout() == \
-                self.example_packet.protos[i].get_field(fieldname).fillout()
-
-        packets = (self.example_xml, self.example_xml2)
-        tmp = ""
+        f = StringIO()
+        f.write(self.example_xml)
+        f.seek(0)
+
+        packets = XML.load(f)
         for p in packets:
-            tmp += p
-            yield load, tmp
-            tmp = tmp[:-8] # </UMPA>\n
+            for i, proto in enumerate(p.protos):
+                for fieldname in proto.get_fields_keys():
+                    assert proto.get_field(fieldname).fillout() == \
+            self.example_packet.protos[i].get_field(fieldname).fillout()
+
+    def test_xml_load_multiple(self):
+        l_xml= (self.example_xml, self.example_xml2)
+        l_packet = (self.example_packet, self.example_packet2)
+        f = StringIO()
+        f.write(l_xml[0][:-8]) # </UMPA>\n
+        f.write(l_xml[1])
+        f.seek(0)
+
+        packets = XML.load(f)
+        for j, p in enumerate(packets):
+            for i, proto in enumerate(p.protos):
+                for fieldname in proto.get_fields_keys():
+                    assert proto.get_field(fieldname).fillout() == \
+            l_packet[j].protos[i].get_field(fieldname).fillout()
 
     def test_xml_load_proto_only(self):

branch/UMPA/umpa/extensions/XML.py

@@ -129 +129 @@
     # useful if you have type in string and need to cast it
     typemap = dict(float=float, int=int, str=str, bool=bool)
-
     packets = []
     for pa in doc.getElementsByTagName("packet"):
@@ -178 +177 @@
         if proto_only:
             return packet.protos
-    packets.append(packet)
+        packets.append(packet)
     return packets