Updates from testing

Author: TimSVector

src/main/resources/scripts/cobertura.py

@@ -87,9 +87,6 @@ def getFileXML(testXml, coverAPI, verbose = False, extended = False, source_root
     fname = coverAPI.display_name
     fpath = os.path.relpath(coverAPI.display_path,prj_dir).replace("\\","/")
 
-    new_path = os.path.join(source_root,fpath.rsplit('/',1)[0])
-    fpath = new_path.replace("\\","/")
-
     branch_totals = float(coverAPI.metrics.branches + coverAPI.metrics.mcdc_branches)
     branch_covered = float(coverAPI.metrics.max_covered_branches + coverAPI.metrics.max_covered_mcdc_branches)
 
@@ -447,8 +444,8 @@ def runCoberturaResults(packages, api, verbose = False, extended = False, source
         if not has_any_coverage(file):
             continue
 
-        #fpath = file.display_path.rsplit('.',1)[0]
-        fpath = file.display_name
+        fname = file.display_name
+        fpath = file.display_path.rsplit('.',1)[0]
         fpath = os.path.relpath(fpath,prj_dir).replace("\\","/")
 
         # print("*", file.name, file.display_name, fpath)
@@ -459,7 +456,6 @@ def runCoberturaResults(packages, api, verbose = False, extended = False, source
         file = fileDict[path]        
         new_path = path.rsplit('/',1)[0]
 
-
         # when we switch paths
         if new_path != path_name:
 
@@ -500,7 +496,7 @@ def runCoberturaResults(packages, api, verbose = False, extended = False, source
                 # remove trailing . if present
                 package_name = path_name.replace("/",".")
                 package_name = package_name.lstrip(".")
-
+                
                 if package_name.endswith("."):
                     package_name = package_name[:-1]
 

src/main/resources/scripts/css/tooltip.css

@@ -0,0 +1,28 @@
+.tooltip {
+  position: relative;
+  display: inline-block;
+  border-bottom: 2px dotted orange;
+}
+
+.tooltip .tooltiptext {
+  visibility: hidden;
+  width: max-content;
+  background-color: black;
+  color: #fff;
+  text-align: left;
+  border-radius: 6px;
+  padding: 5px 0;
+
+  /* Position the tooltip */
+  position: absolute;
+  z-index: 1;
+  bottom: 150%;
+  left: 50%;
+  margin-left: -60px;
+}
+
+.tooltip:hover .tooltiptext {
+  visibility: visible;
+}
+
+pre {background-color:#fcfcfc;}

src/main/resources/scripts/generate_lcov.py

@@ -38,6 +38,7 @@
 from collections import defaultdict
 from pprint import pprint
 import subprocess
+import argparse
 
 from vcast_utils import dump, checkVectorCASTVersion
 
@@ -112,9 +113,9 @@ def runCoverageResultsMP(mpFile, verbose = False, testName = "", source_root = "
     vcproj = VCProjectApi(mpFile)
     api = vcproj.project.cover_api
 
-    return runGcovResults(api, verbose = False, testName = vcproj.project.name, source_root=source_root)
+    return runGcovResults(api, verbose = verbose, testName = vcproj.project.name, source_root=source_root)
 
-def runGcovResults(api, verbose = False, testName = "", source_root = ""):
+def runGcovResults(api, verbose = False, testName = "", source_root = "") :
 
     fileDict = {}
     try:
@@ -167,11 +168,13 @@ def runGcovResults(api, verbose = False, testName = "", source_root = ""):
                 FNDA.append("FNDA:1" + "," + fName)
             else:
                 FNDA.append("FNDA:0" + "," + fName)
-            
+                            
             block_count = 0
             branch_number = 0
             line_branch = []
-                
+
+            last_line = ""
+            
             for line in func.iterate_coverage():
                 if has_any_coverage(line):
                     LF += 1
@@ -182,6 +185,8 @@ def runGcovResults(api, verbose = False, testName = "", source_root = ""):
                         lineCovered = "0"
                     DA.append("DA:" + str(line.line_number) + "," + lineCovered)
 
+                    last_line = line.text
+ 
                     newBranch = False
                     if has_branch_coverage(line) > 0:
                         BRF += 1
@@ -200,6 +205,13 @@ def runGcovResults(api, verbose = False, testName = "", source_root = ""):
                         if newBranch:
                             block_count += 1
                             branch_number += 1
+            
+
+            if "return" not in last_line:
+                if verbose: print("counting last line: ", func.name, line.line_number,last_line)
+                DA.append("DA:" + str(line.line_number) + ",1")
+            else:
+                if verbose: print("not counting last line: ", func.name, line.line_number,last_line)
 
         for idx in range(0,len(FN)):
             output += FN[idx] + "\n"
@@ -268,22 +280,34 @@ def generateCoverageResults(inFile, xml_data_dir = "xml_data", verbose = False,
     if not checkVectorCASTVersion(21):
         print("Cannot create LCOV metrics. Please upgrade VectorCAST")
         sys.exit()
-            
+        
+    parser = argparse.ArgumentParser()
+    parser.add_argument('vcProjectName', help='VectorCAST Project Name', action="store")
+    parser.add_argument('-v', '--verbose',   help='Enable versobe output', dest="verbose", action="store_true", default=False)
+    args = parser.parse_args()
+
     try:
-        inFile = sys.argv[1]
+        inFile = args.vcProjectName
         if not inFile.endswith(".vcm"):
            inFile += ".vcm"
     except:
         inFile = os.getenv('VCAST_MANAGE_PROJECT_DIRECTORY') + ".vcm"
+
+    if args.verbose: print ("Running in verbose mode")
 
-    passed = generateCoverageResults(inFile, xml_data_dir = "xml_data", verbose = False, source_root = "")
+    passed = generateCoverageResults(inFile, xml_data_dir = "xml_data", verbose = args.verbose, source_root = "")
 
-    ## if opened from VectorCAST GUI...
-    if passed and not os.getenv('VCAST_MANAGE_PROJECT_DIRECTORY') is None:
-        from vector.lib.core import VC_Report_Client
+    try:
+        ## if opened from VectorCAST GUI...
+        if passed and not os.getenv('VCAST_MANAGE_PROJECT_DIRECTORY') is None:
+            from vector.lib.core import VC_Report_Client
+
+            # Open report in VectorCAST GUI
+            report_client = VC_Report_Client.ReportClient()
+            if report_client.is_connected():
+                report_client.open_report("out/index.html", "lcov Results")
+    except:
+        pass
+
 
-        # Open report in VectorCAST GUI
-        report_client = VC_Report_Client.ReportClient()
-        if report_client.is_connected():
-            report_client.open_report("out/index.html", "lcov Results")