3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 21:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge from upstream

Browse Source
This commit is contained in:
Malcolm Noyes
2013-12-16 11:31:14 +00:00
parent a3a56158f0 66d641af64
commit b019773537
14 changed files with 198 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/catch_test_case.py
View File

@@ -214,13 +214,17 @@ class TestCaseData:
l = " " + prefix + "</Exception>"
lines.append(l)
elif tmp[0] == "F":
l = " " + prefix + "<Failure>"
lines.append(l)
for li in tmp[1]:
if len(li.strip()) > 0:
lines.append(li)
l = " " + prefix + "</Failure>"
lines.append(l)
if len(tmp[1]) > 0:
l = " " + prefix + "<Failure>"
lines.append(l)
for li in tmp[1]:
if len(li.strip()) > 0:
lines.append(li)
l = " " + prefix + "</Failure>"
lines.append(l)
else:
l = " " + prefix + "<Failure/>"
lines.append(l)
elif tmp[0] == "S":
lines += self.generateRecursiveSection(prefix + " ", tmp)
else:
@@ -306,13 +310,17 @@ class TestCaseData:
l = " " + prefix + "</Warning>"
lines.append(l)
elif section[0] == "F":
l = " " + prefix + "<Failure>"
lines.append(l)
for li in section[1]:
if len(li.strip()) > 0:
lines.append(li)
l = " " + prefix + "</Failure>"
lines.append(l)
if len(section[1]) > 0:
l = " " + prefix + "<Failure>"
lines.append(l)
for li in section[1]:
if len(li.strip()) > 0:
lines.append(li)
l = " " + prefix + "</Failure>"
lines.append(l)
else:
l = " " + prefix + "<Failure/>"
lines.append(l)
return lines
def generateUnapprovedXml(self):

16
scripts/validateVSTests.py
View File

@@ -23,8 +23,8 @@ else:
if sys.platform == 'win32':
cmdPath = os.path.join( catchPath, 'projects\\VS2010\\TestCatch\\Release\\TestCatch.exe' )
# VS2010
#dllPath = os.path.join( catchPath, 'projects\\VS2010\\ManagedTestCatch\\Release\\ManagedTestCatch.dll' )
dllPath = os.path.join( catchPath, 'projects\\VS2010\\ManagedTestCatch\\Debug\\ManagedTestCatch.dll' )
dllPath = os.path.join( catchPath, 'projects\\VS2010\\ManagedTestCatch\\Release\\ManagedTestCatch.dll' )
#dllPath = os.path.join( catchPath, 'projects\\VS2010\\ManagedTestCatch\\Debug\\ManagedTestCatch.dll' )
# VS2012 managed
#dllPath = os.path.join( catchPath, 'projects\\VS2012\\ManagedTestCatch\\Debug\\ManagedTestCatch.dll' )
# VS2012 native
@@ -461,8 +461,10 @@ def approveXml( baseName, args ):
ls = text.splitlines()
section = testcase.addWarning(ls)
elif exp.tag == "Failure":
text = exp.text
ls = text.splitlines()
ls = []
if exp.text != None:
text = exp.text
ls = text.splitlines()
section = testcase.addSimpleFailure(ls)
elif exp.tag == "OverallResult":
testcase.addOverallResult(exp.get("success"))
@@ -578,8 +580,10 @@ def approveXml( baseName, args ):
ls = text.splitlines()
section = testcase.addWarning(ls)
elif exp.tag == "Failure":
text = exp.text
ls = text.splitlines()
ls = []
if exp.text != None:
text = exp.text
ls = text.splitlines()
section = testcase.addSimpleFailure(ls)
elif exp.tag == "OverallResult":
testcase.addOverallResult(exp.get("success"))