Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove the URI prefixs when it's an external report #152

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+102 −126
Open

Remove the URI prefixs when it's an external report #152

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65e87a8
Remove the URI prefixs when it's an external report
rliu-parasoft Oct 21, 2024
ddb6ff2
Optimized code based on feedback
rliu-parasoft Oct 21, 2024
db70db0
Simplified the code
rwang-parasoft Oct 21, 2024
baec7b3
Make uri system compatible
rwang-parasoft Oct 22, 2024
1bf3b50
Optimized the code of resolving source code path
rwang-parasoft Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 43 additions & 2 deletions src/main/resources/com/parasoft/findings/jenkins/coverage/cobertura.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,40 @@
<xsl:variable name="toolVer" select="/Coverage/@toolVer"/>
<xsl:variable name="toolDispName" select="/Coverage/@toolDispName"/>
<xsl:param name="pipelineBuildWorkingDirectory"><xsl:value-of select="/Coverage/@pipelineBuildWorkingDirectory"/></xsl:param>

<!-- Used to store the URI prefix adapted to the current report for later calculation of the relative path -->
<xsl:variable name="uriPrefix">
<xsl:variable name="firstLocUri" select="/Coverage/Locations/Loc[1]/@uri"/>
<!-- Try to take the first <Loc> as an example to get prefix -->
<xsl:choose>
<!-- for file:/xxx uri pattern -->
<xsl:when test="matches($firstLocUri, '^file:/[^/]')">file:/</xsl:when>
<!-- for file://hostname/xxx uri pattern -->
<xsl:when test="matches($firstLocUri, '^file://[^/]+/')">
<!-- Extract the hostname from an uri, like: the result is 'hostname' for uri 'file://hostname/folder/xxx' -->
<xsl:variable name="hostname" select="replace($firstLocUri, '^file://([^/]+)(/.*)$', '$1')" />
<xsl:value-of select="concat('file://', $hostname, '/')" />
</xsl:when>
<!-- for file:///xxx uri pattern -->
<xsl:otherwise>file:///</xsl:otherwise>
</xsl:choose>
</xsl:variable>

<!-- Template for formatting URIs -->
<xsl:template name="formatUri">
<xsl:param name="uri"/>
<xsl:param name="prefix"/>

<!-- Remove prefix if present and trim spaces -->
<xsl:variable name="withoutPrefix" select="replace($uri, concat($prefix, ''), '')"/>
<!-- Trim spaces at the front and back ends of the URI -->
<xsl:variable name="trimmedUri" select="replace(replace($withoutPrefix, '^\s+', ''), '\s+$', '')"/>
<!-- Replace backslashes with forward slashes for consistency in path formatting -->
<xsl:variable name="processedUri" select="translate($trimmedUri, '\', '/')"/>

<xsl:value-of select="$processedUri"/>
</xsl:template>

<xsl:template match="/">
<xsl:element name="coverage">
<xsl:variable name="allLocNodes" select="/Coverage/Locations/Loc"/>
Expand Down Expand Up @@ -42,6 +76,13 @@
<xsl:element name="packages">
<!-- Group by the parent path of uri-->
<xsl:for-each-group select="/Coverage/Locations/Loc" group-by="substring-before(@uri, tokenize(@uri, '/')[last()])">
<xsl:variable name="rawUri" select="@uri"/>
Copy link
Collaborator

@rwang-parasoft rwang-parasoft Oct 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. We can add a variable named uriWithoutFilePrefix.
<xsl:variable name="uriWithoutFilePrefix">
     <xsl:call-template name="getuUriWithoutFilePrefix">
        <xsl:with-param name="uri" select="$rawUri"/>
    </xsl:call-template>
</xsl:variable>
  1. Add a templat named getUriWithoutFilePrefix, and process uri in this template.
  2. Use uriWithFileInitialize where previously used uri

<xsl:variable name="formattedUri">
<xsl:call-template name="formatUri">
<xsl:with-param name="uri" select="$rawUri"/>
<xsl:with-param name="prefix" select="$uriPrefix"/>
</xsl:call-template>
</xsl:variable>
<xsl:variable name="lineRateForPacakgeTag">
<xsl:call-template name="getLineRateForPackage">
<xsl:with-param name="locNodesToCalcute" select="current-group()"/>
Expand Down Expand Up @@ -79,7 +120,7 @@
<xsl:choose>
<xsl:when test="$isExternalReport">
<xsl:call-template name="getPackageName">
<xsl:with-param name="projectPath" select="@uri"/>
<xsl:with-param name="projectPath" select="$formattedUri"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
Expand All @@ -101,7 +142,7 @@
<xsl:variable name="filePath">
<xsl:choose>
<xsl:when test="$isExternalReport">
<xsl:value-of select="@uri"/>
<xsl:value-of select="$formattedUri"/>
</xsl:when>
<xsl:otherwise>
<!-- Get relative source file path -->
Expand Down