Updates from 0.79

Author: TimSVector

src/main/java/com/vectorcast/plugins/vectorcastexecution/VectorCASTJobPipeline.java

@@ -46,7 +46,7 @@
 
 import hudson.model.AutoCompletionCandidates;
 import org.kohsuke.stapler.QueryParameter;
-
+import org.kohsuke.stapler.DataBoundSetter;
 
 /**
  * Create pipeline job.
@@ -115,7 +115,7 @@ public ExternalResultsFileException getResException() {
     public String getUrlName() {
         return "pipeline-job";
     }
-    
+
     /**
      * Get node label.
      * @return node label
@@ -129,7 +129,7 @@ public String getNodeLabel() {
      * @param inputNL - input nodel label
      */
     @DataBoundSetter
-    public void setNodeLabel(String inputNL) {
+    public void setNodeLabel(final String inputNL) {
         this.nodeLabel = inputNL;
     }
 

src/main/resources/scripts/cobertura.py

@@ -44,7 +44,7 @@
 
 fileList = []
 
-from vcast_utils import dump, checkVectorCASTVersion, getVectorCASTEncoding
+from vcast_utils import dump, checkVectorCASTVersion, getVectorCASTEncoding, checkProjectResults
 
 encFmt = getVectorCASTEncoding()
 
@@ -347,11 +347,13 @@ def procesCoverage(coverXML, coverApi, extended = False, source_root = ""):
 
     if extended:
         for func in coverApi.functions:
-                      
+    
+            if isinstance(func.instrumented_functions[0].parameterized_name, bool):
+                continue
+                
             method = etree.SubElement(methods, "method")
-            
             method.attrib['name'] = func.name
-            method.attrib['signature'] = func.instrumented_functions[0].parameterized_name.replace(func.name,"",1)
+            method.attrib['signature'] = func.instrumented_functions[0].parameterized_name.replace(func.name,"",1)    
             method.attrib['line-rate'] = str(func.metrics.max_covered_statements_pct/100.0)
 
             statementPercentStr = "{:.2f}".format(func.metrics.max_covered_statements_pct) + "% (" + str(func.metrics.max_covered_statements) + "/" + str(func.metrics.statements) + ")"             
@@ -387,11 +389,26 @@ def procesCoverage(coverXML, coverApi, extended = False, source_root = ""):
     return processStatementBranchMCDC(coverApi, lines, extended)
 
 def runCoverageResultsMP(packages, mpFile, verbose = False, extended=False, source_root = ""):
+    
+    with VCProjectApi(mpFile) as vcproj:
 
-    vcproj = VCProjectApi(mpFile)
-    api = vcproj.project.cover_api
+        anyLocalResults, anyImportedResults = checkProjectResults(vcproj)
+
+        if anyImportedResults:
+            importedResultsError = "  ** Cobertura results does not processing imported results at this time\n\n"
+            print(importedResultsError)
+            return [-1] * 19
+            
+        if not anyLocalResults:
+            localResultsError = "  ** No local results in project to process\n\n"
+            print(localResultsError)
+            return [-1] * 19
+
+        api = vcproj.project.cover_api
+        
+        results = runCoberturaResults(packages, api, verbose = False, extended = extended, source_root = source_root)
 
-    return runCoberturaResults(packages, api, verbose = False, extended = extended, source_root = source_root)
+    return results
 
 def runCoberturaResults(packages, api, verbose = False, extended = False, source_root = ""):
 
@@ -449,8 +466,7 @@ def runCoberturaResults(packages, api, verbose = False, extended = False, source
         except:
             prj_dir = os.getcwd().replace("\\","/") + "/"    
 
-    # get a sorted listed of all the files with the proj directory stripped off
-     
+    # get a sorted listed of all the files with the proj directory stripped off     
     for file in api.SourceFile.all():  
         if file.display_name == "":
             continue
@@ -752,7 +768,7 @@ def generateCoverageResults(inFile, azure = False, xml_data_dir = "xml_data", ve
     if MCDC_rate   != -1.0: print ("mcdc pairs: {:.2f}% ({:d} out of {:d})".format(MCDC_rate*100.0, cov_mcdc, total_mcdc))
 
     if statement_rate   != -1.0: print ("coverage: {:.2f}% of statements".format(statement_rate*100.0))
-    print ("complexity: {:d}".format(complexity))
+    if complexity       != -1.0: print ("complexity: {:d}".format(complexity))
     source = etree.SubElement(sources, "source")
     source.text = "./"
 

src/main/resources/scripts/copy_build_dir.py

@@ -237,9 +237,8 @@ def run(ManageProjectName, Level, BaseName, Env, workspace, vCastProjectWorkspac
 
 def getVcastProjectWorkspace(args):
 
-    vc_api = VCProjectApi(args.ManageProject)
-    vCastProjectWorkspace = vc_api.project.workspace
-    vc_api.close()
+    with VCProjectApi(args.ManageProject) as vcproj:
+        vCastProjectWorkspace = vcproj.project.workspace
 
     return vCastProjectWorkspace
 

src/main/resources/scripts/create_index_html.py

@@ -104,26 +104,24 @@ def create_index_html(mpName, isGitLab = False, output_dir = ""):
     global baseOutputDir
     baseOutputDir = output_dir
 
-    api = VCProjectApi(mpName)
-    # Set custom report directory to the where this script was
-    # found. Must contain sections/index_section.py
-    rep_path = pathlib.Path(__file__).parent.resolve()
+    with VCProjectApi(mpName) as vcproj: 
+        # Set custom report directory to the where this script was
+        # found. Must contain sections/index_section.py
+        rep_path = pathlib.Path(__file__).parent.resolve()
 
-    if usingGitLabCI:
-        output_file=os.path.join(baseOutputDir,"index.html")
-    else:
-        output_file=os.path.join(baseOutputDir,"index.html")
-        
-    CustomReport.report_from_api(
-            api=api,
-            title="HTML Reports",
-            report_type="INDEX_FILE",
-            formats=["HTML"],
-            output_file=output_file,
-            sections=['CUSTOM_HEADER', 'REPORT_TITLE', 'TABLE_OF_CONTENTS','INDEX_SECTION', 'CUSTOM_FOOTER'],
-            customization_dir=rep_path)
-
-    api.close()
+        if usingGitLabCI:
+            output_file=os.path.join(baseOutputDir,"index.html")
+        else:
+            output_file=os.path.join(baseOutputDir,"index.html")
+            
+        CustomReport.report_from_api(
+                api=vcproj,
+                title="HTML Reports",
+                report_type="INDEX_FILE",
+                formats=["HTML"],
+                output_file=output_file,
+                sections=['CUSTOM_HEADER', 'REPORT_TITLE', 'TABLE_OF_CONTENTS','INDEX_SECTION', 'CUSTOM_FOOTER'],
+                customization_dir=rep_path)
 
 def create_index_html_body ():
 

src/main/resources/scripts/full_report_no_toc.py

@@ -36,23 +36,6 @@ def generate_full_status(manageProject):
     mpName = os.path.splitext(os.path.basename(manageProject))[0]
     full_report_name = mpName + "_full_report.html"
     metrics_report_name = mpName + "_metrics_report.html"
-
-    # try:
-        # from vector.apps.DataAPI.vcproject_api import VCProjectApi
-        # api = VCProjectApi(manageProject)
-        
-        # api.report(report_type="MANAGE_STATUS_FULL_REPORT", formats=["HTML"], output_file=full_report_name   , environments=api.Environment.all(), levels = [])
-        # api.report(report_type="MANAGE_METRICS_REPORT"    , formats=["HTML"], output_file=metrics_report_name, environments=api.Environment.all(), levels = [])
-            
-        # shutil.copy(full_report_name,full_report_name + "_tmp")
-        # fixup_reports.fixup_2020_reports(full_report_name + "_tmp")
-        
-        # shutil.copy(metrics_report_name,metrics_report_name + "_tmp")
-        # fixup_reports.fixup_2020_reports(metrics_report_name + "_tmp")
-
-        # api.close()
-        
-    # except:
 
     from managewait import ManageWait
 

src/main/resources/scripts/generate-results.py

@@ -556,15 +556,13 @@ def buildReports(FullManageProjectName = None,
         print("Cleanup: " + str(time.time()))
     if useNewReport and not legacy:
         try:
-            api = VCProjectApi(FullManageProjectName)
-            tool_version = api.tool_version
-            if tool_version.startswith("20"):
-                use_manage_api = False
-            else:
-                use_manage_api = True
-            api.close()
+            with VCProjectApi(FullManageProjectName) as vcproj:
+                tool_version = vcproj.tool_version
+                if tool_version.startswith("20"):
+                    use_manage_api = False
+                else:
+                    use_manage_api = True
         except:
-            ##teePrint.teePrint("   *INFO: Issue getting tool version from: " + FullManageProjectName)
             use_manage_api = False
 
         if use_manage_api:
@@ -582,17 +580,17 @@ def buildReports(FullManageProjectName = None,
                 manageEnvs, level, envName, cbtDict, generate_individual_reports, 
                 use_archive_extract, report_only_failures, no_full_report,
                 useStartLine, teePrint, use_cte)
-            
-            with open("unit_test_fail_count.txt", "wb") as fd:
-                fd.write(str(failed_count).encode(encFmt, "replace"))
-
-            with open("unit_test_passfail_count.txt", "wb") as fd:
-                text = "{} {}".format(passed_count, failed_count)
-                fd.write(text.encode(encFmt, "replace"))
-                   
+                
         if timing:
             print("XML and Individual reports: " + str(time.time()))
 
+        with open("unit_test_fail_count.txt", "wb") as fd:
+            fd.write(str(failed_count).encode(encFmt, "replace"))
+
+        with open("unit_test_passfail_count.txt", "wb") as fd:
+            text = "{} {}".format(passed_count, failed_count)
+            fd.write(text.encode(encFmt, "replace"))
+
     ### NOT Using new data API        
     else:
 
@@ -761,17 +759,18 @@ def buildReports(FullManageProjectName = None,
                         failed_count += int(line.split("\"")[5])
                         passed_count += int(line.split("\"")[3]) - failed_count
                         break
-        except:
-            teePrint.teePrint ("   *INFO: Problem parsing test results file for unit testcase failure count: " + file)
-            if print_exc:  traceback.print_exc()
-            
+                        
             with open("unit_test_fail_count.txt", "wb") as fd:
                 fd.write(str(failed_count).encode(encFmt, "replace"))
 
             with open("unit_test_passfail_count.txt", "wb") as fd:
                 text = "{} {}".format(passed_count, failed_count)
                 fd.write(text.encode(encFmt, "replace"))
 
+        except:
+            teePrint.teePrint ("   *INFO: Problem parsing test results file for unit testcase failure count: " + file)
+            if print_exc:  traceback.print_exc()
+            
         for file in copyList:
 
             if verbose:

src/main/resources/scripts/generate_lcov.py

@@ -40,12 +40,17 @@
 import subprocess
 import argparse
 
-from vcast_utils import dump, checkVectorCASTVersion, getVectorCASTEncoding
+from vcast_utils import dump, checkVectorCASTVersion, getVectorCASTEncoding, checkProjectResults
 try:
     from safe_open import open
 except:
     pass
 
+try:
+    import math
+    INF = math.inf
+except Exception:
+    INF = float("inf")  # Py2-compatible
 encFmt = getVectorCASTEncoding()
 
 fileList = []
@@ -116,30 +121,46 @@ def has_branches_covered(line):
 
 def get_function_name_line_number(file_path, function, initial_guess):
 
-    with open(file_path,"rb") as fd:
+    with open(file_path, "rb") as fd:
         lines = [line.decode(encFmt, "replace") for line in fd.readlines()]
-        
-    line_number_closest_so_far = initial_guess;
-    delta = 9999999999;
 
-    # print(function, line_number_closest_so_far, delta, initial_guess)
-    for count, line in enumerate(reversed(lines[:initial_guess+1])):
-        if function in line.replace(" ",""):
+    if initial_guess is None or initial_guess >= len(lines):
+        initial_guess = len(lines) - 1
+
+    line_number_closest_so_far = initial_guess
+    delta = INF
+
+    for count, line in enumerate(reversed(lines[:initial_guess + 1])):
+        if function in line.replace(" ", ""):
             line_num = initial_guess - count
             if abs(line_num - initial_guess) < delta:
                 line_number_closest_so_far = line_num
                 delta = abs(line_num - initial_guess)
-                # print(function, line_number_closest_so_far, delta, initial_guess)
-    
-    # print(line_number_closest_so_far + 1,function)
-    return line_number_closest_so_far + 1 ## add one since python starts from 0
+
+    return line_number_closest_so_far + 1  # convert 0-based to 1-based
+
 
 def runCoverageResultsMP(mpFile, verbose = False, testName = "", source_root = ""):
 
-    vcproj = VCProjectApi(mpFile)
-    api = vcproj.project.cover_api
+    with VCProjectApi(mpFile) as vcproj:
+    
+        anyLocalResults, anyImportedResults = checkProjectResults(vcproj)
+
+        if anyImportedResults:
+            importedResultsError = "  ** LCOV results does not processing imported results at this time\n\n"
+            print(importedResultsError)
+            return importedResultsError
+            
+        if not anyLocalResults:
+            localResultsError = "  ** No local results in project to process\n\n"
+            print(localResultsError)
+            return localResultsError
+
+        api = vcproj.project.cover_api
+        
+        results = runGcovResults(api, verbose = verbose, testName = vcproj.project.name, source_root=source_root)
 
-    return runGcovResults(api, verbose = verbose, testName = vcproj.project.name, source_root=source_root)
+    return results
 
 def runGcovResults(api, verbose = False, testName = "", source_root = "") :
 
@@ -152,7 +173,7 @@ def runGcovResults(api, verbose = False, testName = "", source_root = "") :
         except:
             prj_dir = os.getcwd().replace("\\","/") + "/"    
 
-    # get a sorted listed of all the files with the proj directory stripped off
+    # get a sorted listed of all the files with the proj directory stripped off    
     for file in api.SourceFile.all():  
         if file.display_name == "":
             continue

src/main/resources/scripts/generate_pclp_reports.py

@@ -324,21 +324,19 @@ def generate_html_report(mpName, input_xml, output_html):
     if output_html is None:
         output_html = "pclp_findings.html"
 
-    api = VCProjectApi(mpName)
-
-    # Set custom report directory to the where this script was
-    # found. Must contain sections/index_section.py
-    rep_path = pathlib.Path(__file__).parent.resolve()
-    CustomReport.report_from_api(
-            api=api,
-            title="PC-Lint Plus Results",
-            report_type="INDEX_FILE",
-            formats=["HTML"],
-            output_file=output_html,
-            sections=['CUSTOM_HEADER', 'REPORT_TITLE', 'TABLE_OF_CONTENTS','PCLP_SUMMARY_SECTION','PCLP_DETAILS_SECTION','PCLP_SOURCE_SECTION', 'CUSTOM_FOOTER'],
-            customization_dir=rep_path)
-
-    api.close()
+    with VCProjectApi(mpName) as vcproj:
+
+        # Set custom report directory to the where this script was
+        # found. Must contain sections/index_section.py
+        rep_path = pathlib.Path(__file__).parent.resolve()
+        CustomReport.report_from_api(
+                api=vcproj,
+                title="PC-Lint Plus Results",
+                report_type="INDEX_FILE",
+                formats=["HTML"],
+                output_file=output_html,
+                sections=['CUSTOM_HEADER', 'REPORT_TITLE', 'TABLE_OF_CONTENTS','PCLP_SUMMARY_SECTION','PCLP_DETAILS_SECTION','PCLP_SOURCE_SECTION', 'CUSTOM_FOOTER'],
+                customization_dir=rep_path)
 
 def has_any_coverage(line):