p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #108 from pjreed/jade-devel 

Fixing a few incorrect method calls in junitxml.py
This commit is contained in:
Dirk Thomas 2016-03-04 11:06:40 -08:00
parent b164b1ac42 86e6e62102
commit 9b9ea3729e
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/rosunit/src/rosunit/junitxml.py
View File

@ -89,7 +89,7 @@ class TestError(TestInfo):
@return XML tag representing the object, with non-XML text filtered out @return XML tag representing the object, with non-XML text filtered out
@rtype: str @rtype: str
""" """
return ET.tostring(self.xml_element, encoding='utf-8', method='xml') return ET.tostring(self.xml_element(), encoding='utf-8', method='xml')
def xml_element(self): def xml_element(self):
""" """
@ -110,7 +110,7 @@ class TestFailure(TestInfo):
@return XML tag representing the object, with non-XML text filtered out @return XML tag representing the object, with non-XML text filtered out
@rtype: str @rtype: str
""" """
return ET.tostring(self.xml_element, encoding='utf-8', method='xml') return ET.tostring(self.xml_element(), encoding='utf-8', method='xml')
def xml_element(self): def xml_element(self):
""" """
@ -200,7 +200,7 @@ class TestCaseResult(object):
@return XML tag representing the object, with non-XML text filtered out @return XML tag representing the object, with non-XML text filtered out
@rtype: str @rtype: str
""" """
return ET.tostring(self.xml_element, encoding='utf-8', method='xml') return ET.tostring(self.xml_element(), encoding='utf-8', method='xml')
def xml_element(self): def xml_element(self):
""" """
@ -214,7 +214,7 @@ class TestCaseResult(object):
for f in self.failures: for f in self.failures:
testcase.append(f.xml_element()) testcase.append(f.xml_element())
for e in self.errors: for e in self.errors:
testcase.append(e.xml()) testcase.append(e.xml_element())
return testcase return testcase
class Result(object): class Result(object):

38
tools/rosunit/test/test_junitxml.py
View File

@ -91,6 +91,44 @@ def _writeMockResultFile(result):
if len(result.suites) > 1 or result.noSuitesRoot == False: if len(result.suites) > 1 or result.noSuitesRoot == False:
f.write('</testsuites>\n') f.write('</testsuites>\n')
class XmlResultTestGeneration(unittest.TestCase):
def setUp(self):
global junitxml
if junitxml is None:
import rosunit.junitxml
junitxml = rosunit.junitxml
def tearDown(self):
pass
def testGenerateError(self):
error = junitxml.TestError('error_type', 'error_text')
error_str = error.xml()
self.assertEquals('''<error type="error_type">&lt;![CDATA[
error_text
]]&gt;</error>''', error_str)
def testGenerateFailure(self):
failure = junitxml.TestFailure('failure_type', 'failure_text')
failure_str = failure.xml()
self.assertEquals('''<failure type="failure_type">&lt;![CDATA[
failure_text
]]&gt;</failure>''', failure_str)
def testGenerateTestCaseResult(self):
testcase = junitxml.TestCaseResult('test_case')
error = junitxml.TestError('error_type', 'error_text')
error_str = error.xml()
failure = junitxml.TestFailure('failure_type', 'failure_text')
failure_str = failure.xml()
testcase.add_error(error)
testcase.add_failure(failure)
testcase_str = testcase.xml()
self.assertEquals('''<testcase classname="" name="test_case" time="0.0"><failure type="failure_type">&lt;![CDATA[
failure_text
]]&gt;</failure><error type="error_type">&lt;![CDATA[
error_text
]]&gt;</error></testcase>''', testcase_str)
class XmlResultTestRead(unittest.TestCase): class XmlResultTestRead(unittest.TestCase):