You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/08/01 08:02:05 UTC
svn commit: r1754707 - in /jmeter/trunk: extras/build.xml
extras/jmeter-results-detail-report.xsl
extras/jmeter-results-detail-report_21.xsl extras/jmeter-results-report.xsl
extras/jmeter-results-report_21.xsl xdocs/changes.xml
Author: pmouawad
Date: Mon Aug 1 08:02:05 2016
New Revision: 1754707
URL: http://svn.apache.org/viewvc?rev=1754707&view=rev
Log:
Bug 59918 - Ant generated HTML report is broken (extras folder)
Bugzilla Id: 59918
Added:
jmeter/trunk/extras/jmeter-results-detail-report_21.xsl (with props)
jmeter/trunk/extras/jmeter-results-report_21.xsl (with props)
Removed:
jmeter/trunk/extras/jmeter-results-detail-report.xsl
jmeter/trunk/extras/jmeter-results-report.xsl
Modified:
jmeter/trunk/extras/build.xml
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/extras/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/extras/build.xml?rev=1754707&r1=1754706&r2=1754707&view=diff
==============================================================================
--- jmeter/trunk/extras/build.xml (original)
+++ jmeter/trunk/extras/build.xml Mon Aug 1 08:02:05 2016
@@ -38,10 +38,6 @@
N.B. Ant interprets relative paths against the build file
-Djmeter.home=.. - path to JMeter home directory (defaults to parent of this build file)
-Dreport.title="My Report" - title for html report (default is 'Load Test Results')
-
- Deprecated:
- -Dformat=2.0 - use version 2.0 JTL files rather than 2.1
-
</description>
<property name="testpath" value="${user.dir}"/>
@@ -56,10 +52,6 @@
<property name="format" value="2.1"/>
- <condition property="style_version" value="">
- <equals arg1="${format}" arg2="2.0"/>
- </condition>
-
<condition property="style_version" value="_21">
<equals arg1="${format}" arg2="2.1"/>
</condition>
Added: jmeter/trunk/extras/jmeter-results-detail-report_21.xsl
URL: http://svn.apache.org/viewvc/jmeter/trunk/extras/jmeter-results-detail-report_21.xsl?rev=1754707&view=auto
==============================================================================
--- jmeter/trunk/extras/jmeter-results-detail-report_21.xsl (added)
+++ jmeter/trunk/extras/jmeter-results-detail-report_21.xsl Mon Aug 1 08:02:05 2016
@@ -0,0 +1,411 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Stylesheet for processing 2.1 output format test result files
+ To uses this directly in a browser, add the following to the JTL file as line 2:
+ <?xml-stylesheet type="text/xsl" href="../extras/jmeter-results-detail-report_21.xsl"?>
+ and you can then view the JTL in a browser
+-->
+
+<xsl:output method="html" indent="yes" encoding="UTF-8" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
+
+<!-- Defined parameters (overrideable) -->
+<xsl:param name="showData" select="'n'"/>
+<xsl:param name="titleReport" select="'Load Test Results'"/>
+<xsl:param name="dateReport" select="'date not defined'"/>
+
+<xsl:template match="testResults">
+ <html>
+ <head>
+ <title><xsl:value-of select="$titleReport" /></title>
+ <style type="text/css">
+ body {
+ font:normal 68% verdana,arial,helvetica;
+ color:#000000;
+ }
+ table tr td, table tr th {
+ font-size: 68%;
+ }
+ table.details tr th{
+ color: #ffffff;
+ font-weight: bold;
+ text-align:center;
+ background:#2674a6;
+ white-space: nowrap;
+ }
+ table.details tr td{
+ background:#eeeee0;
+ white-space: nowrap;
+ }
+ h1 {
+ margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+ }
+ h2 {
+ margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+ }
+ h3 {
+ margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+ }
+ .Failure {
+ font-weight:bold; color:red;
+ }
+
+
+ img
+ {
+ border-width: 0px;
+ }
+
+ .expand_link
+ {
+ position=absolute;
+ right: 0px;
+ width: 27px;
+ top: 1px;
+ height: 27px;
+ }
+
+ .page_details
+ {
+ display: none;
+ }
+
+ .page_details_expanded
+ {
+ display: block;
+ display/* hide this definition from IE5/6 */: table-row;
+ }
+
+
+ </style>
+ <script language="JavaScript"><![CDATA[
+ function expand(details_id)
+ {
+
+ document.getElementById(details_id).className = "page_details_expanded";
+ }
+
+ function collapse(details_id)
+ {
+
+ document.getElementById(details_id).className = "page_details";
+ }
+
+ function change(details_id)
+ {
+ if(document.getElementById(details_id+"_image").src.match("expand"))
+ {
+ document.getElementById(details_id+"_image").src = "collapse.png";
+ expand(details_id);
+ }
+ else
+ {
+ document.getElementById(details_id+"_image").src = "expand.png";
+ collapse(details_id);
+ }
+ }
+ ]]></script>
+ </head>
+ <body>
+
+ <xsl:call-template name="pageHeader" />
+
+ <xsl:call-template name="summary" />
+ <hr size="1" width="95%" align="center" />
+
+ <xsl:call-template name="pagelist" />
+ <hr size="1" width="95%" align="center" />
+
+ <xsl:call-template name="detail" />
+
+ </body>
+ </html>
+</xsl:template>
+
+<xsl:template name="pageHeader">
+ <h1><xsl:value-of select="$titleReport" /></h1>
+ <table width="100%">
+ <tr>
+ <td align="left">Date report: <xsl:value-of select="$dateReport" /></td>
+ <td align="right">Designed for use with <a href="http://jmeter.apache.org/">JMeter</a> and <a href="http://ant.apache.org">Ant</a>.</td>
+ </tr>
+ </table>
+ <hr size="1" />
+</xsl:template>
+
+<xsl:template name="summary">
+ <h2>Summary</h2>
+ <table align="center" class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+ <tr valign="top">
+ <th># Samples</th>
+ <th>Failures</th>
+ <th>Success Rate</th>
+ <th>Average Time</th>
+ <th>Min Time</th>
+ <th>Max Time</th>
+ </tr>
+ <tr valign="top">
+ <xsl:variable name="allCount" select="count(/testResults/*)" />
+ <xsl:variable name="allFailureCount" select="count(/testResults/*[attribute::s='false'])" />
+ <xsl:variable name="allSuccessCount" select="count(/testResults/*[attribute::s='true'])" />
+ <xsl:variable name="allSuccessPercent" select="$allSuccessCount div $allCount" />
+ <xsl:variable name="allTotalTime" select="sum(/testResults/*/@t)" />
+ <xsl:variable name="allAverageTime" select="$allTotalTime div $allCount" />
+ <xsl:variable name="allMinTime">
+ <xsl:call-template name="min">
+ <xsl:with-param name="nodes" select="/testResults/*/@t" />
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:variable name="allMaxTime">
+ <xsl:call-template name="max">
+ <xsl:with-param name="nodes" select="/testResults/*/@t" />
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="$allFailureCount > 0">Failure</xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+ <td align="center">
+ <xsl:value-of select="$allCount" />
+ </td>
+ <td align="center">
+ <xsl:value-of select="$allFailureCount" />
+ </td>
+ <td align="center">
+ <xsl:call-template name="display-percent">
+ <xsl:with-param name="value" select="$allSuccessPercent" />
+ </xsl:call-template>
+ </td>
+ <td align="center">
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$allAverageTime" />
+ </xsl:call-template>
+ </td>
+ <td align="center">
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$allMinTime" />
+ </xsl:call-template>
+ </td>
+ <td align="center">
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$allMaxTime" />
+ </xsl:call-template>
+ </td>
+ </tr>
+ </table>
+</xsl:template>
+
+<xsl:template name="pagelist">
+ <h2>Pages</h2>
+ <table align="center" class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+ <tr valign="top">
+ <th>URL</th>
+ <th># Samples</th>
+ <th>Failures</th>
+ <th>Success Rate</th>
+ <th>Average Time</th>
+ <th>Min Time</th>
+ <th>Max Time</th>
+ <th></th>
+ </tr>
+ <xsl:for-each select="/testResults/*[not(@lb = preceding::*/@lb)]">
+ <xsl:variable name="label" select="@lb" />
+ <xsl:variable name="count" select="count(../*[@lb = current()/@lb])" />
+ <xsl:variable name="failureCount" select="count(../*[@lb = current()/@lb][attribute::s='false'])" />
+ <xsl:variable name="successCount" select="count(../*[@lb = current()/@lb][attribute::s='true'])" />
+ <xsl:variable name="successPercent" select="$successCount div $count" />
+ <xsl:variable name="totalTime" select="sum(../*[@lb = current()/@lb]/@t)" />
+ <xsl:variable name="averageTime" select="$totalTime div $count" />
+ <xsl:variable name="minTime">
+ <xsl:call-template name="min">
+ <xsl:with-param name="nodes" select="../*[@lb = current()/@lb]/@t" />
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:variable name="maxTime">
+ <xsl:call-template name="max">
+ <xsl:with-param name="nodes" select="../*[@lb = current()/@lb]/@t" />
+ </xsl:call-template>
+ </xsl:variable>
+ <tr valign="top">
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="$failureCount > 0">Failure</xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+ <td>
+ <xsl:if test="$failureCount > 0">
+ <a><xsl:attribute name="href">#<xsl:value-of select="$label" /></xsl:attribute>
+ <xsl:value-of select="$label" />
+ </a>
+ </xsl:if>
+ <xsl:if test="0 >= $failureCount">
+ <xsl:value-of select="$label" />
+ </xsl:if>
+ </td>
+ <td align="center">
+ <xsl:value-of select="$count" />
+ </td>
+ <td align="center">
+ <xsl:value-of select="$failureCount" />
+ </td>
+ <td align="right">
+ <xsl:call-template name="display-percent">
+ <xsl:with-param name="value" select="$successPercent" />
+ </xsl:call-template>
+ </td>
+ <td align="right">
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$averageTime" />
+ </xsl:call-template>
+ </td>
+ <td align="right">
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$minTime" />
+ </xsl:call-template>
+ </td>
+ <td align="right">
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$maxTime" />
+ </xsl:call-template>
+ </td>
+ <td align="center">
+ <a href="">
+ <xsl:attribute name="href"><xsl:text/>javascript:change('page_details_<xsl:value-of select="position()" />')</xsl:attribute>
+ <img src="expand.png" alt="expand/collapse"><xsl:attribute name="id"><xsl:text/>page_details_<xsl:value-of select="position()" />_image</xsl:attribute></img>
+ </a>
+ </td>
+ </tr>
+
+ <tr class="page_details">
+ <xsl:attribute name="id"><xsl:text/>page_details_<xsl:value-of select="position()" /></xsl:attribute>
+ <td colspan="8" bgcolor="#FF0000">
+ <div align="center">
+ <b>Details for Page "<xsl:value-of select="$label" />"</b>
+ <table bordercolor="#000000" bgcolor="#2674A6" border="0" cellpadding="1" cellspacing="1" width="95%">
+ <tr>
+ <th>Thread</th>
+ <th>Iteration</th>
+ <th>Time (milliseconds)</th>
+ <th>Bytes</th>
+ <th>Success</th>
+ </tr>
+
+ <xsl:for-each select="../*[@lb = $label and @tn != $label]">
+ <tr>
+ <td><xsl:value-of select="@tn" /></td>
+ <td align="center"><xsl:value-of select="position()" /></td>
+ <td align="right"><xsl:value-of select="@t" /></td>
+ <!-- TODO allow for missing bytes field -->
+ <td align="right"><xsl:value-of select="@by" /></td>
+ <td align="center"><xsl:value-of select="@s" /></td>
+ </tr>
+ </xsl:for-each>
+
+ </table>
+ </div>
+ </td>
+ </tr>
+
+ </xsl:for-each>
+ </table>
+</xsl:template>
+
+<xsl:template name="detail">
+ <xsl:variable name="allFailureCount" select="count(/testResults/*[attribute::s='false'])" />
+
+ <xsl:if test="$allFailureCount > 0">
+ <h2>Failure Detail</h2>
+
+ <xsl:for-each select="/testResults/*[not(@lb = preceding::*/@lb)]">
+
+ <xsl:variable name="failureCount" select="count(../*[@lb = current()/@lb][attribute::s='false'])" />
+
+ <xsl:if test="$failureCount > 0">
+ <h3><xsl:value-of select="@lb" /><a><xsl:attribute name="name"><xsl:value-of select="@lb" /></xsl:attribute></a></h3>
+
+ <table align="center" class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+ <tr valign="top">
+ <th>Response</th>
+ <th>Failure Message</th>
+ <xsl:if test="$showData = 'y'">
+ <th>Response Data</th>
+ </xsl:if>
+ </tr>
+
+ <xsl:for-each select="/testResults/*[@lb = current()/@lb][attribute::s='false']">
+ <tr>
+ <td><xsl:value-of select="@rc | @rs" /> - <xsl:value-of select="@rm" /></td>
+ <td><xsl:value-of select="assertionResult/failureMessage" /></td>
+ <xsl:if test="$showData = 'y'">
+ <td><xsl:value-of select="./binary" /></td>
+ </xsl:if>
+ </tr>
+ </xsl:for-each>
+
+ </table>
+ </xsl:if>
+
+ </xsl:for-each>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template name="min">
+ <xsl:param name="nodes" select="/.." />
+ <xsl:choose>
+ <xsl:when test="not($nodes)">NaN</xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="$nodes">
+ <xsl:sort data-type="number" />
+ <xsl:if test="position() = 1">
+ <xsl:value-of select="number(.)" />
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="max">
+ <xsl:param name="nodes" select="/.." />
+ <xsl:choose>
+ <xsl:when test="not($nodes)">NaN</xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="$nodes">
+ <xsl:sort data-type="number" order="descending" />
+ <xsl:if test="position() = 1">
+ <xsl:value-of select="number(.)" />
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="display-percent">
+ <xsl:param name="value" />
+ <xsl:value-of select="format-number($value,'0.00%')" />
+</xsl:template>
+
+<xsl:template name="display-time">
+ <xsl:param name="value" />
+ <xsl:value-of select="format-number($value,'0 ms')" />
+</xsl:template>
+
+</xsl:stylesheet>
Propchange: jmeter/trunk/extras/jmeter-results-detail-report_21.xsl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jmeter/trunk/extras/jmeter-results-report_21.xsl
URL: http://svn.apache.org/viewvc/jmeter/trunk/extras/jmeter-results-report_21.xsl?rev=1754707&view=auto
==============================================================================
--- jmeter/trunk/extras/jmeter-results-report_21.xsl (added)
+++ jmeter/trunk/extras/jmeter-results-report_21.xsl Mon Aug 1 08:02:05 2016
@@ -0,0 +1,302 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ Stylesheet for processing 2.1 output format test result files
+ To uses this directly in a browser, add the following to the JTL file as line 2:
+ <? xml-stylesheet type="text/xsl" href="../extras/jmeter-results-report_21.xsl" ?>
+ and you can then view the JTL in a browser
+-->
+
+<xsl:output method="html" indent="yes" encoding="UTF-8" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
+
+<xsl:param name="titleReport" select="'Load Test Results'"/>
+<xsl:param name="dateReport" select="'date not defined'"/>
+
+<xsl:template match="testResults">
+ <html>
+ <head>
+ <title><xsl:value-of select="$titleReport" /></title>
+ <style type="text/css">
+ body {
+ font:normal 68% verdana,arial,helvetica;
+ color:#000000;
+ }
+ table tr td, table tr th {
+ font-size: 68%;
+ }
+ table.details tr th{
+ color: #ffffff;
+ font-weight: bold;
+ text-align:center;
+ background:#2674a6;
+ white-space: nowrap;
+ }
+ table.details tr td{
+ background:#eeeee0;
+ white-space: nowrap;
+ }
+ h1 {
+ margin: 0px 0px 5px; font: 165% verdana,arial,helvetica
+ }
+ h2 {
+ margin-top: 1em; margin-bottom: 0.5em; font: bold 125% verdana,arial,helvetica
+ }
+ h3 {
+ margin-bottom: 0.5em; font: bold 115% verdana,arial,helvetica
+ }
+ .Failure {
+ font-weight:bold; color:red;
+ }
+ </style>
+ </head>
+ <body>
+
+ <xsl:call-template name="pageHeader" />
+
+ <xsl:call-template name="summary" />
+ <hr size="1" width="95%" align="center" />
+
+ <xsl:call-template name="pagelist" />
+ <hr size="1" width="95%" align="center" />
+
+ <xsl:call-template name="detail" />
+
+ </body>
+ </html>
+</xsl:template>
+
+<xsl:template name="pageHeader">
+ <h1><xsl:value-of select="$titleReport" /></h1>
+ <table width="100%">
+ <tr>
+ <td align="left">Date report: <xsl:value-of select="$dateReport" /></td>
+ <td align="right">Designed for use with <a href="http://jmeter.apache.org/">JMeter</a> and <a href="http://ant.apache.org">Ant</a>.</td>
+ </tr>
+ </table>
+ <hr size="1" />
+</xsl:template>
+
+<xsl:template name="summary">
+ <h2>Summary</h2>
+ <table align="center" class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+ <tr valign="top">
+ <th># Samples</th>
+ <th>Failures</th>
+ <th>Success Rate</th>
+ <th>Average Time</th>
+ <th>Min Time</th>
+ <th>Max Time</th>
+ </tr>
+ <tr valign="top">
+ <xsl:variable name="allCount" select="count(/testResults/*)" />
+ <xsl:variable name="allFailureCount" select="count(/testResults/*[attribute::s='false'])" />
+ <xsl:variable name="allSuccessCount" select="count(/testResults/*[attribute::s='true'])" />
+ <xsl:variable name="allSuccessPercent" select="$allSuccessCount div $allCount" />
+ <xsl:variable name="allTotalTime" select="sum(/testResults/*/@t)" />
+ <xsl:variable name="allAverageTime" select="$allTotalTime div $allCount" />
+ <xsl:variable name="allMinTime">
+ <xsl:call-template name="min">
+ <xsl:with-param name="nodes" select="/testResults/*/@t" />
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:variable name="allMaxTime">
+ <xsl:call-template name="max">
+ <xsl:with-param name="nodes" select="/testResults/*/@t" />
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="$allFailureCount > 0">Failure</xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+ <td align="center">
+ <xsl:value-of select="$allCount" />
+ </td>
+ <td align="center">
+ <xsl:value-of select="$allFailureCount" />
+ </td>
+ <td align="right">
+ <xsl:call-template name="display-percent">
+ <xsl:with-param name="value" select="$allSuccessPercent" />
+ </xsl:call-template>
+ </td>
+ <td align="right">
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$allAverageTime" />
+ </xsl:call-template>
+ </td>
+ <td align="right">
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$allMinTime" />
+ </xsl:call-template>
+ </td>
+ <td align="right">
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$allMaxTime" />
+ </xsl:call-template>
+ </td>
+ </tr>
+ </table>
+</xsl:template>
+<xsl:template name="pagelist">
+ <h2>Pages</h2>
+ <table align="center" class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+ <tr valign="top">
+ <th>URL</th>
+ <th># Samples</th>
+ <th>Failures</th>
+ <th>Success Rate</th>
+ <th>Average Time</th>
+ <th>Min Time</th>
+ <th>Max Time</th>
+ </tr>
+ <xsl:for-each select="/testResults/*[not(@lb = preceding::*/@lb)]">
+ <xsl:variable name="label" select="@lb" />
+ <xsl:variable name="count" select="count(../*[@lb = current()/@lb])" />
+ <xsl:variable name="failureCount" select="count(../*[@lb = current()/@lb][attribute::s='false'])" />
+ <xsl:variable name="successCount" select="count(../*[@lb = current()/@lb][attribute::s='true'])" />
+ <xsl:variable name="successPercent" select="$successCount div $count" />
+ <xsl:variable name="totalTime" select="sum(../*[@lb = current()/@lb]/@t)" />
+ <xsl:variable name="averageTime" select="$totalTime div $count" />
+ <xsl:variable name="minTime">
+ <xsl:call-template name="min">
+ <xsl:with-param name="nodes" select="../*[@lb = current()/@lb]/@t" />
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:variable name="maxTime">
+ <xsl:call-template name="max">
+ <xsl:with-param name="nodes" select="../*[@lb = current()/@lb]/@t" />
+ </xsl:call-template>
+ </xsl:variable>
+ <tr valign="top">
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="$failureCount > 0">Failure</xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+ <td>
+ <xsl:value-of select="$label" />
+ </td>
+ <td align="center">
+ <xsl:value-of select="$count" />
+ </td>
+ <td align="center">
+ <xsl:value-of select="$failureCount" />
+ </td>
+ <td align="right">
+ <xsl:call-template name="display-percent">
+ <xsl:with-param name="value" select="$successPercent" />
+ </xsl:call-template>
+ </td>
+ <td align="right">
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$averageTime" />
+ </xsl:call-template>
+ </td>
+ <td align="right">
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$minTime" />
+ </xsl:call-template>
+ </td>
+ <td align="right">
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$maxTime" />
+ </xsl:call-template>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </table>
+</xsl:template>
+
+<xsl:template name="detail">
+ <xsl:variable name="allFailureCount" select="count(/testResults/*[attribute::s='false'])" />
+
+ <xsl:if test="$allFailureCount > 0">
+ <h2>Failure Detail</h2>
+
+ <xsl:for-each select="/testResults/*[not(@lb = preceding::*/@lb)]">
+
+ <xsl:variable name="failureCount" select="count(../*[@lb = current()/@lb][attribute::s='false'])" />
+
+ <xsl:if test="$failureCount > 0">
+ <h3><xsl:value-of select="@lb" /></h3>
+
+ <table align="center" class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+ <tr valign="top">
+ <th>Response</th>
+ <th>Failure Message</th>
+ </tr>
+
+ <xsl:for-each select="/testResults/*[@lb = current()/@lb][attribute::s='false']">
+ <tr>
+ <td><xsl:value-of select="@rc | @rs" /> - <xsl:value-of select="@rm" /></td>
+ <td><xsl:value-of select="assertionResult/failureMessage" /></td>
+ </tr>
+ </xsl:for-each>
+
+ </table>
+ </xsl:if>
+
+ </xsl:for-each>
+ </xsl:if>
+</xsl:template>
+
+<xsl:template name="min">
+ <xsl:param name="nodes" select="/.." />
+ <xsl:choose>
+ <xsl:when test="not($nodes)">NaN</xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="$nodes">
+ <xsl:sort data-type="number" />
+ <xsl:if test="position() = 1">
+ <xsl:value-of select="number(.)" />
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="max">
+ <xsl:param name="nodes" select="/.." />
+ <xsl:choose>
+ <xsl:when test="not($nodes)">NaN</xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="$nodes">
+ <xsl:sort data-type="number" order="descending" />
+ <xsl:if test="position() = 1">
+ <xsl:value-of select="number(.)" />
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="display-percent">
+ <xsl:param name="value" />
+ <xsl:value-of select="format-number($value,'0.00%')" />
+</xsl:template>
+
+<xsl:template name="display-time">
+ <xsl:param name="value" />
+ <xsl:value-of select="format-number($value,'0 ms')" />
+</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
Propchange: jmeter/trunk/extras/jmeter-results-report_21.xsl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1754707&r1=1754706&r2=1754707&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Mon Aug 1 08:02:05 2016
@@ -120,6 +120,7 @@ Summary
<ul>
<li><bug>59803</bug>Use <code>isValid()</code> method from jdbc driver, if no validationQuery
is given in JDBC Connection Configuration.</li>
+ <li><bug>59918</bug>Ant generated HTML report is broken (extras folder)</li>
</ul>
<ch_section>Non-functional changes</ch_section>