| "
for f in ddl[B.DATA_NODE_HEADER]:
job.debug(verify, "ddl " + f + " ")
header.append({ "field": f, "type": ddl[f]["type"], "acceptance": ddl[f]["acceptance"]})
diff --git a/utils/path_tool.py b/utils/path_tool.py
index 3ec0dc4..1bdc00b 100644
--- a/utils/path_tool.py
+++ b/utils/path_tool.py
@@ -14,7 +14,7 @@ import basic.constants as B
def getKeyValue(key, comp=None):
job = basic.program.Job.getInstance()
- verify = job.getDebugLevel("path_tool")
+ verify = job.getDebugLevel("path_tool")-4
pt = PathConf.getInstance()
job.debug(verify, "getKeyValue " + key)
if 'job.par' in key:
@@ -30,7 +30,7 @@ def getKeyValue(key, comp=None):
raise Exception("Component is missing for "+key)
if not utils.config_tool.hasAttr(comp, key[5:]):
pass
- pass
+ return utils.config_tool.getAttr(comp, key[5:])
elif 'env.' in key:
#if key[4:]
pass
@@ -61,6 +61,7 @@ def composePatttern(pattern, comp):
l = re.findall('\{.*?\}', pattern)
job.debug(verify, l)
for pat in l:
+ print(str(max) + ": " + pattern + ": " + pat)
pit = getKeyValue(pat[1:-1], comp)
job.debug(verify, str(max) + ": " + pattern + ": " + pat + ": " + pit)
pattern = pattern.replace(pat, pit)
diff --git a/utils/report_tool.py b/utils/report_tool.py
index a07057d..ca43bff 100644
--- a/utils/report_tool.py
+++ b/utils/report_tool.py
@@ -13,40 +13,254 @@ the reporting-system in bottom-up
(2.2) transfer of the summary result-code of each testcase to an extern reporting-system - protocol -
(2.3) visualization of final result-code of each component and each testcase in test-set - result-report -
(2.4) visualization of statistical result-codes of each component and each test-set in test-context - result-report -
+ | testcase-artefact | testcase-report | testsuite-report
+title | comparison | testcase | testsuite
+table0 | | each component | each testcase x each component
+ h1 | | | testcase
+ h2 | | component | component
+ h3 | -- | main-comparison | main-comparison
+ h4 | | other comparison | other comparison
"""
+import os
+import re
import basic.program
+import utils.match_tool as M
+import basic.constants as B
+import utils.css_tool
+import utils.path_tool
-def getTcExtraction(tcpath, comp):
- """
- extracts the pure differences of diff-files
- :param comp:
- :return: html-code with links to diff-files
- """
- job = basic.program.Job.getInstance()
- verify = -0 + job.getDebugLevel("report_tool")
- job.debug(verify, "writeDataTable " + str(comp))
- body = ''
- # for f in diff-files:
- # body = body + extractDiffLines
- body = body + '
"+M.MATCH[matchtype]["title"]+"
"
+ elif len(testcase) > 1:
+ html = ""+REP_TITLE+" "+REP_TC+" "+testcase+""+REP_TITLE+" "+REP_TC+" "+testcase+"
"
+ else:
+ html = ""+REP_TITLE+" "+REP_TS+" "+getattr(job.par, "testsuite")+""+REP_TITLE+" "+REP_TS+" "+getattr(job.par, "testsuite")+"
"
+ if hasattr(job.par, B.PAR_DESCRIPT):
+ html += ""+getattr(job.par, B.PAR_DESCRIPT)+"
"
+ return html
+
+ def getCssClass(self, testcase="", component="", artefact="", match=""):
+ """
+ the function calculates the maximum cssClass of the granularity
+ the cssClass means the fault-class of the matching
+ :param testcase:
+ :param component:
+ :param artefact:
+ :return:
+ """
+ cssClass = "result0"
+ if len(match) > 0:
+ if match in self.report[testcase][component][artefact]:
+ if "css" in self.report[testcase][component][artefact][match]:
+ if cssClass < self.report[testcase][component][artefact][match]["css"]:
+ cssClass = self.report[testcase][component][artefact][match]["css"]
+ return cssClass
+ elif len(artefact) > 0:
+ for match in self.report[testcase][component][artefact]:
+ if "css" in self.report[testcase][component][artefact][match]:
+ if cssClass < self.report[testcase][component][artefact][match]["css"]:
+ cssClass = self.report[testcase][component][artefact][match]["css"]
+ return cssClass
+ elif len(component) > 0:
+ for a in self.report[testcase][component]:
+ val = self.getCssClass(testcase, component, a)
+ if cssClass < val:
+ cssClass = val
+ return cssClass
+ elif len(testcase) > 0:
+ for c in self.report[testcase]:
+ val = self.getCssClass(testcase, c, "")
+ if cssClass < val:
+ cssClass = val
+ return cssClass
+ return cssClass
+
+ def getHeader(self):
+ job = basic.program.Job.getInstance()
+ verify = int(job.getDebugLevel("report_tool"))-1
+ htmltxt = ""
+ htmltxt += ""
+ htmltxt += utils.css_tool.getInternalStyle("diffFiles")
+ return htmltxt
+
+ def getOverviewHead(self, testcase=""):
+ if len(testcase) < 1:
+ return ""
+ htmlHead = "| "+REP_TC+" | "
+ for c in self.report[testcase]:
+ if c in ["overview", "block"]:
+ continue
+ htmlHead += "" + c + " | "
+ return htmlHead
+
+ def getOverview(self, testcase=""):
+ if len(testcase) < 1:
+ return ""
+ htmlHead = self.getOverviewHead(testcase)
+ htmlBody = "
|---|
| "+testcase+" | "
+ for c in self.report[testcase]:
+ cssClass = self.getCssClass(testcase, c, "")
+ htmlBody += "" + testcase + " | "
+ return htmlHead+"
"+htmlBody+"
"
+
+ def getTestcaseHead(self, testcase="", component="", artefact="", matchtype=""):
+ if len(testcase) < 1:
+ return ""
+ cssClass = self.getCssClass(testcase, "", "")
+ html = ""
+ return html
+
+ def getComponentHead(self, testcase="", component="", artefact="", matchtype=""):
+ job = basic.program.Job.getInstance()
+ return ""+REP_COMP+" "+component+"
"
+
+ def getArtefactBlock(self, testcase, component, artefact, matchtype=""):
+ job = basic.program.Job.getInstance()
+ html = ""+REP_ART+" "+artefact+"
"
+ for match in self.report[testcase][component][artefact]:
+ cssClass = self.getCssClass(testcase, component, artefact, match)
+ path = self.getFilepath(testcase, component, artefact, match)
+ path = path.replace(job.conf.confs[B.SUBJECT_PATH][B.ATTR_PATH_ARCHIV], os.path.join("..", ".."))
+ html += " "+M.MATCH[match]["filename"]+" "
+ html += "
"
+ if len(matchtype) < 1:
+ matchtype = M.MATCH_POSTCOND
+ html += "\n"
+ for side in ["A", "B"]:
+ path = self.report[testcase][component][artefact][matchtype]["path"+side]
+ href = path.replace(job.conf.confs[B.SUBJECT_PATH][B.ATTR_PATH_ARCHIV], os.path.join("..", ".."))
+ html += M.MATCH[M.MATCH[M.MATCH_POSTCOND][side]]["long"]+" "
+ html += ""+path+"\n"
+ if side == "A": html += "
"
+ html += "
"
+ return html
+
+ def getFilepath(self, testcase, component, artefact, matchtype):
+ cm = basic.componentHandling.ComponentManager()
+ comp = cm.getComponent(component)
+ path = os.path.join(utils.path_tool.composePatttern("{tcresult}", comp), artefact+"_"+M.MATCH[matchtype]["filename"]+".html")
+ return path
+
+ def getComparisonBlock(self, testcase, component, artefact, matchtype):
+ html = self.report[testcase][component][artefact][matchtype]["diff"]
+ return html
+
+ def reportTestcase(self, testcase):
+ job = basic.program.Job.getInstance()
+ verify = int(job.getDebugLevel("report_tool")) - 1
+ html = self.getHeader()
+ html += self.getTitle(testcase)
+ html += self.getOverview(testcase)
+ html += ""
+ html += self.getTestcaseHead(testcase)
+ for component in self.report[testcase]:
+ html += self.getComponentHead(testcase, component)
+ for artefact in self.report[testcase][component]:
+ html += self.getArtefactBlock(testcase, component, artefact, M.MATCH_POSTCOND)
+ html += self.getComparisonBlock(testcase, component, artefact, M.MATCH_POSTCOND)
+ html += "
<-- class=\"tc-block\" -->"
+ html += ""
+ return html
+
+ def extractTestcase(self, testcase, html):
+ job = basic.program.Job.getInstance()
+ verify = int(job.getDebugLevel("report_tool")) - 1
+ overview = re.findall("
|---|