Enhance coverage-report.xsl to be able to specify css location (#194)

cmarchand · AirQuick · commit 0e21fca45850 · 2018-04-10T01:02:24.000+09:00
Also
* Enhance it to be able to inline css
* Update xspec.sh and xpsec.bat to enable inline css (aligned with #135)
diff --git a/bin/xspec.bat b/bin/xspec.bat
@@ -590,6 +590,7 @@ if defined COVERAGE (
         -xsl:"%XSPEC_HOME%\src\reporter\coverage-report.xsl" ^
         tests="file:/%WIN_XSPEC_ABS:\\=/\\%" ^
         pwd="file:/%CD:\=/%/" ^
+        inline-css=true ^
         || ( call :die "Error formating the coverage report" & goto :win_main_error_exit )
     call :win_echo "Report available at %COVERAGE_HTML%"
     rem %OPEN% "%COVERAGE_HTML%"
diff --git a/bin/xspec.sh b/bin/xspec.sh
@@ -374,6 +374,7 @@ if test -n "$COVERAGE"; then
         -xsl:"$XSPEC_HOME/src/reporter/coverage-report.xsl" \
         "tests=$XSPEC" \
         "pwd=file:`pwd`/" \
+        inline-css=true \
         || die "Error formating the coverage report"
     echo "Report available at $COVERAGE_HTML"
     #$OPEN "$COVERAGE_HTML"
diff --git a/src/reporter/coverage-report.xsl b/src/reporter/coverage-report.xsl
@@ -22,6 +22,12 @@
 <xsl:param name="pwd"   as="xs:string" required="yes"/>
 <xsl:param name="tests" as="xs:string" required="yes"/>
 
+<xsl:param name="inline-css">false</xsl:param>
+  
+<xsl:param name="report-css-uri" select="
+    resolve-uri('test-report.css', static-base-uri())"/>
+
+
 <xsl:variable name="tests-uri" as="xs:anyURI" select="
     resolve-uri(translate($tests, '\', '/'), $pwd)"/>
 
@@ -63,8 +69,15 @@
   <html>
     <head>
       <title>Test Coverage Report for <xsl:value-of select="test:format-URI($stylesheet-uri)" /></title>
-      <link rel="stylesheet" type="text/css" 
-        href="{resolve-uri('test-report.css', static-base-uri())}" />
+      <xsl:if test="$inline-css = 'false'">
+         <link rel="stylesheet" type="text/css" 
+            href="{$report-css-uri}"/>
+      </xsl:if>
+      <xsl:if test="not($inline-css = 'false')">
+        <style type="text/css">
+          <xsl:value-of select="unparsed-text($report-css-uri)" disable-output-escaping="yes"/>
+        </style>
+      </xsl:if>
     </head>
     <body>
       <h1>Test Coverage Report</h1>
