@@ -266,9 +266,8 @@ def test_render_record(system):
266266 chunk = one (fh .chunks ())
267267 record = one (chunk .records ())
268268
269- xml = "<?xml version= \" 1.0 \" encoding= \" utf-8 \" standalone= \" yes \" ?> \n %s" % e_views . evtx_record_xml_view ( record )
269+ xml = record . xml ()
270270 assert xml == textwrap .dedent ('''\
271- <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
272271 <Event xmlns="http://schemas.microsoft.com/win/2004/08/events/event"><System><Provider Name="Microsoft-Windows-Eventlog" Guid="{fc65ddd8-d6ef-4962-83d5-6e5cfe9ce148}"></Provider>
273272 <EventID Qualifiers="">105</EventID>
274273 <Version>0</Version>
@@ -302,8 +301,7 @@ def test_render_records(system):
302301 fh = evtx .FileHeader (system , 0x0 )
303302 for chunk in fh .chunks ():
304303 for record in chunk .records ():
305- xml = "<?xml version=\" 1.0\" encoding=\" utf-8\" standalone=\" yes\" ?>\n %s" % e_views .evtx_record_xml_view (record )
306- assert xml is not None
304+ assert record .xml () is not None
307305
308306
309307def test_render_records2 (security ):
@@ -316,26 +314,7 @@ def test_render_records2(security):
316314 fh = evtx .FileHeader (security , 0x0 )
317315 for chunk in fh .chunks ():
318316 for record in chunk .records ():
319- xml = "<?xml version=\" 1.0\" encoding=\" utf-8\" standalone=\" yes\" ?>\n %s" % e_views .evtx_record_xml_view (record )
320- assert xml is not None
321-
322-
323- def to_lxml (record ):
324- """
325- convert the given record to a lxml-parsed document.
326-
327- Args:
328- record (evtx.Record): the record to parse.
329-
330- Returns:
331- lxml.etree.ETree: the lxml document.
332- """
333- text = e_views .evtx_record_xml_view (record )
334- try :
335- return lxml .etree .fromstring (b"<?xml version=\" 1.0\" encoding=\" utf-8\" standalone=\" yes\" ?>" + text .encode ('utf-8' ))
336- except :
337- print (text )
338- raise
317+ assert record .xml () is not None
339318
340319
341320@pytest .mark .skipif (no_lxml , reason = 'lxml not installed' )
@@ -349,8 +328,7 @@ def test_render_records_lxml(system):
349328 fh = evtx .FileHeader (system , 0x0 )
350329 for i , chunk in enumerate (fh .chunks ()):
351330 for j , record in enumerate (chunk .records ()):
352- xml = to_lxml (record )
353- assert xml is not None
331+ assert record .lxml () is not None
354332
355333
356334@pytest .mark .skipif (no_lxml , reason = 'lxml not installed' )
@@ -364,5 +342,4 @@ def test_render_records_lxml2(security):
364342 fh = evtx .FileHeader (security , 0x0 )
365343 for i , chunk in enumerate (fh .chunks ()):
366344 for j , record in enumerate (chunk .records ()):
367- xml = to_lxml (record )
368- assert xml is not None
345+ assert record .lxml () is not None
0 commit comments