Revision: 9559
Author: [email protected]
Date: Mon Jan 17 09:08:08 2011
Log: Move the TCK report task to user/build.xml and
delete samples/validationtck
Review at http://gwt-code-reviews.appspot.com/1288801
Review by: [email protected]
http://code.google.com/p/google-web-toolkit/source/detail?r=9559
Added:
/trunk/user/style
/trunk/user/style/html
/trunk/user/style/html/junit-noframes.xsl
/trunk/user/style/text
/trunk/user/style/text/junit-noframes.xsl
Deleted:
/trunk/samples/validationtck
Modified:
/trunk/common.ant.xml
/trunk/user/build.xml
=======================================
--- /dev/null
+++ /trunk/user/style/html/junit-noframes.xsl Mon Jan 17 09:08:08 2011
@@ -0,0 +1,507 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0"
+ xmlns:lxslt="http://xml.apache.org/xslt";
+ xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils">
+<xsl:output method="html" indent="yes" encoding="UTF-8"
+ doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
+<xsl:decimal-format decimal-separator="." grouping-separator="," />
+<!--
+ 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.
+ -->
+
+<xsl:param name="TITLE">JSR-303 TCK report</xsl:param>
+
+<!--
+
+ Modified from the default stylesheet.
+ Changed so counts are relative to the TOTAL tests in the TCK
+
+-->
+
+<xsl:param name="markedFailing" />
+<xsl:param name="markedNonTckTest" />
+<xsl:param name="markedNotSupported" />
+
+<xsl:template match="testsuites">
+ <html>
+ <head>
+ <title><xsl:value-of select="$TITLE"/></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{
+ font-weight: bold;
+ text-align:left;
+ background:#a6caf0;
+ }
+ table.details tr td{
+ background:#eeeee0;
+ }
+
+ p {
+ line-height:1.5em;
+ margin-top:0.5em; margin-bottom:1.0em;
+ }
+ 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
+ }
+ h4 {
+ margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+ }
+ h5 {
+ margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+ }
+ h6 {
+ margin-bottom: 0.5em; font: bold 100% verdana,arial,helvetica
+ }
+ .Error {
+ font-weight:bold; color:red;
+ }
+ .Failure {
+ font-weight:bold; color:purple;
+ }
+ .Properties {
+ text-align:right;
+ }
+ </style>
+ <script type="text/javascript" language="JavaScript">
+ var TestCases = new Array();
+ var cur;
+ <xsl:for-each select="./testsuite">
+ <xsl:apply-templates select="properties"/>
+ </xsl:for-each>
+
+ </script>
+ <script type="text/javascript" language="JavaScript"><![CDATA[
+ function displayProperties (name) {
+ var win =
window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
+ var doc = win.document;
+ doc.open();
+ doc.write("<html><head><title>Properties of " + name
+ "</title>");
+ doc.write("<style>")
+ doc.write("body {font:normal 68% verdana,arial,helvetica;
color:#000000; }");
+ doc.write("table tr td, table tr th { font-size: 68%; }");
+ doc.write("table.properties { border-collapse:collapse;
border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
+ doc.write("table.properties th { text-align:left;
border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc;
background-color:#eeeeee; }");
+ doc.write("table.properties td { font:normal; text-align:left;
border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc;
background-color:#fffffff; }");
+ doc.write("h3 { margin-bottom: 0.5em; font: bold 115%
verdana,arial,helvetica }");
+ doc.write("</style>");
+ doc.write("</head><body>");
+ doc.write("<h3>Properties of " + name + "</h3>");
+ doc.write("<div align=\"right\"><a
href=\"javascript:window.close();\">Close</a></div>");
+ doc.write("<table class='properties'>");
+ doc.write("<tr><th>Name</th><th>Value</th></tr>");
+ for (prop in TestCases[name]) {
+ doc.write("<tr><th>" + prop + "</th><td>" +
TestCases[name][prop] + "</td></tr>");
+ }
+ doc.write("</table>");
+ doc.write("</body></html>");
+ doc.close();
+ win.focus();
+ }
+ ]]>
+ </script>
+ </head>
+ <body>
+ <a name="top"></a>
+ <xsl:call-template name="pageHeader"/>
+
+ <!-- Summary part -->
+ <xsl:call-template name="summary"/>
+ <hr size="1" width="95%" align="left"/>
+
+ <!-- Package List part -->
+ <xsl:call-template name="packagelist"/>
+ <hr size="1" width="95%" align="left"/>
+
+ <!-- For each package create its part -->
+ <xsl:call-template name="packages"/>
+ <hr size="1" width="95%" align="left"/>
+
+ <!-- For each class create the part -->
+ <xsl:call-template name="classes"/>
+
+ </body>
+ </html>
+</xsl:template>
+
+
+
+ <!--
================================================================== -->
+ <!-- Write a list of all packages with an hyperlink to the anchor
of -->
+ <!-- of the package
name. -->
+ <!--
================================================================== -->
+ <xsl:template name="packagelist">
+ <h2>Packages</h2>
+ Note: package statistics are not computed recursively, they only
sum up all of its testsuites numbers.
+ <table class="details" border="0" cellpadding="5" cellspacing="2"
width="95%">
+ <xsl:call-template name="testsuite.test.header"/>
+ <!-- list all packages recursively -->
+ <xsl:for-each select="./testsuite[not(./@package =
preceding-sibling::testsuite/@package)]">
+ <xsl:sort select="@package"/>
+ <xsl:variable name="testsuites-in-package"
select="/testsuites/testsuite[./@package = current()/@package]"/>
+ <xsl:variable name="testCount"
select="sum($testsuites-in-package/@tests)"/>
+ <xsl:variable name="errorCount"
select="sum($testsuites-in-package/@errors)"/>
+ <xsl:variable name="failureCount"
select="sum($testsuites-in-package/@failures)"/>
+ <xsl:variable name="timeCount"
select="sum($testsuites-in-package/@time)"/>
+
+ <!-- write a summary for the package -->
+ <tr valign="top">
+ <!-- set a nice color depending if there is an
error/failure -->
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="$failureCount >
0">Failure</xsl:when>
+ <xsl:when test="$errorCount >
0">Error</xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+ <td><a href="#{@package}"><xsl:value-of
select="@package"/></a></td>
+ <td><xsl:value-of select="$testCount"/></td>
+ <td><xsl:value-of select="$errorCount"/></td>
+ <td><xsl:value-of select="$failureCount"/></td>
+ <td>
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$timeCount"/>
+ </xsl:call-template>
+ </td>
+ <td><xsl:value-of
select="$testsuites-in-package/@timestamp"/></td>
+ <td><xsl:value-of
select="$testsuites-in-package/@hostname"/></td>
+ </tr>
+ </xsl:for-each>
+ </table>
+ </xsl:template>
+
+
+ <!--
================================================================== -->
+ <!-- Write a package level
report -->
+ <!-- It creates a table with values from the
document: -->
+ <!-- Name | Tests | Errors | Failures |
Time -->
+ <!--
================================================================== -->
+ <xsl:template name="packages">
+ <!-- create an anchor to this package name -->
+ <xsl:for-each select="/testsuites/testsuite[not(./@package =
preceding-sibling::testsuite/@package)]">
+ <xsl:sort select="@package"/>
+ <a name="{@package}"></a>
+ <h3>Package <xsl:value-of select="@package"/></h3>
+
+ <table class="details" border="0" cellpadding="5"
cellspacing="2" width="95%">
+ <xsl:call-template name="testsuite.test.header"/>
+
+ <!-- match the testsuites of this package -->
+ <xsl:apply-templates
select="/testsuites/testsuite[./@package = current()/@package]"
mode="print.test"/>
+ </table>
+ <a href="#top">Back to top</a>
+ <p/>
+ <p/>
+ </xsl:for-each>
+ </xsl:template>
+
+ <xsl:template name="classes">
+ <xsl:for-each select="testsuite">
+ <xsl:sort select="@name"/>
+ <!-- create an anchor to this class name -->
+ <a name="{@name}"></a>
+ <h3>TestCase <xsl:value-of select="@name"/></h3>
+
+ <table class="details" border="0" cellpadding="5"
cellspacing="2" width="95%">
+ <xsl:call-template name="testcase.test.header"/>
+ <!--
+ test can even not be started at all (failure to load the
class)
+ so report the error directly
+ -->
+ <xsl:if test="./error">
+ <tr class="Error">
+ <td colspan="4"><xsl:apply-templates
select="./error"/></td>
+ </tr>
+ </xsl:if>
+ <xsl:apply-templates select="./testcase"
mode="print.test"/>
+ </table>
+ <div class="Properties">
+ <a>
+ <xsl:attribute
name="href">javascript:displayProperties('<xsl:value-of
select="@package"/>.<xsl:value-of select="@name"/>');</xsl:attribute>
+ Properties »
+ </a>
+ </div>
+ <p/>
+
+ <a href="#top">Back to top</a>
+ </xsl:for-each>
+ </xsl:template>
+
+ <xsl:template name="summary">
+ <h2>Summary</h2>
+ <xsl:variable name="rawTestCount" select="258"/>
+ <!--
+ rawTestCount from
+ jar -xf jsr303-tck-1.0.3.GA-sources.jar
+ grep -r \@Test org/hibernate/jsr303/tck/tests/| grep -v "enabled
= false" | wc -l
+ -->
+ <xsl:variable name="testCount" select="($rawTestCount -
$markedNotSupported)"/>
+ <xsl:variable name="testExecutedCount"
select="sum(testsuite/@tests)"/>
+ <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
+ <xsl:variable name="failureCount"
select="sum(testsuite/@failures)"/>
+ <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
+ <xsl:variable name="passedCount" select="($testExecutedCount -
$failureCount - $errorCount)"/>
+ <xsl:variable name="successRate" select="($passedCount) div
$testCount"/>
+ <h3>
+ <xsl:value-of select="$passedCount" /> <xsl:text> of </xsl:text>
+ <xsl:value-of select="$testCount"/> <xsl:text> (</xsl:text>
+ <xsl:call-template name="display-percent">
+ <xsl:with-param name="value" select="$successRate"/>
+ </xsl:call-template>
+ <xsl:text>) Pass with </xsl:text>
+ <xsl:value-of select="$failureCount"/> <xsl:text> Failures and
</xsl:text>
+ <xsl:value-of select="$errorCount" /> <xsl:text>
Errors.</xsl:text>
+ </h3>
+
+ <xsl:if test="($failureCount + $errorCount) != ($markedFailing)">
+ <p style="color:red"><strong>WARINING</strong> expected Failures +
Errors to match the
+ <xsl:value-of select="$markedFailing" />
+ test marked @Failing</p>
+ </xsl:if>
+ <table class="details" border="0" cellpadding="5" cellspacing="2"
width="95%">
+ <tr valign="top">
+ <th>Tests</th>
+ <th>Passed</th>
+ <th>Failures</th>
+ <th>Errors</th>
+ <th>Success rate</th>
+ <th>Time</th>
+ </tr>
+ <tr valign="top">
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="$failureCount >
0">Failure</xsl:when>
+ <xsl:when test="$errorCount > 0">Error</xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+ <td><xsl:value-of select="$testCount"/></td>
+ <td><xsl:value-of select="$passedCount"/></td>
+ <td><xsl:value-of select="$failureCount"/></td>
+ <td><xsl:value-of select="$errorCount"/></td>
+ <td>
+ <xsl:call-template name="display-percent">
+ <xsl:with-param name="value" select="$successRate"/>
+ </xsl:call-template>
+ </td>
+ <td>
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="$timeCount"/>
+ </xsl:call-template>
+ </td>
+
+ </tr>
+ </table>
+ <table border="0" width="95%">
+ <tr>
+ <td style="text-align: justify;">
+ Note: <i>failures</i> are anticipated and checked for with
assertions while <i>errors</i> are unanticipated.
+ </td>
+ </tr>
+ </table>
+ </xsl:template>
+
+ <!--
+ Write properties into a JavaScript data structure.
+ This is based on the original idea by Erik Hatcher ([email protected])
+ -->
+ <xsl:template match="properties">
+ cur = TestCases['<xsl:value-of select="../@package"/>.<xsl:value-of
select="../@name"/>'] = new Array();
+ <xsl:for-each select="property">
+ <xsl:sort select="@name"/>
+ cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template
name="JS-escape"><xsl:with-param name="string"
select="@value"/></xsl:call-template>';
+ </xsl:for-each>
+ </xsl:template>
+
+<!-- Page HEADER -->
+<xsl:template name="pageHeader">
+ <h1><xsl:value-of select="$TITLE"/></h1>
+ <table width="100%">
+ <tr>
+ <td align="left"></td>
+ <td align="right">Designed for use with <a
href='http://www.junit.org'>JUnit</a> and <a
href='http://ant.apache.org/ant'>Ant</a>.</td>
+ </tr>
+ </table>
+ <hr size="1"/>
+</xsl:template>
+
+<xsl:template match="testsuite" mode="header">
+ <tr valign="top">
+ <th width="80%">Name</th>
+ <th>Tests</th>
+ <th>Errors</th>
+ <th>Failures</th>
+ <th nowrap="nowrap">Time(s)</th>
+ </tr>
+</xsl:template>
+
+<!-- class header -->
+<xsl:template name="testsuite.test.header">
+ <tr valign="top">
+ <th width="80%">Name</th>
+ <th>Tests</th>
+ <th>Errors</th>
+ <th>Failures</th>
+ <th nowrap="nowrap">Time(s)</th>
+ <th nowrap="nowrap">Time Stamp</th>
+ <th>Host</th>
+ </tr>
+</xsl:template>
+
+<!-- method header -->
+<xsl:template name="testcase.test.header">
+ <tr valign="top">
+ <th>Name</th>
+ <th>Status</th>
+ <th width="80%">Type</th>
+ <th nowrap="nowrap">Time(s)</th>
+ </tr>
+</xsl:template>
+
+
+<!-- class information -->
+<xsl:template match="testsuite" mode="print.test">
+ <tr valign="top">
+ <!-- set a nice color depending if there is an error/failure -->
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="@failures[.> 0]">Failure</xsl:when>
+ <xsl:when test="@errors[.> 0]">Error</xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+
+ <!-- print testsuite information -->
+ <td><a href="#{@name}"><xsl:value-of select="@name"/></a></td>
+ <td><xsl:value-of select="@tests"/></td>
+ <td><xsl:value-of select="@errors"/></td>
+ <td><xsl:value-of select="@failures"/></td>
+ <td>
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="@time"/>
+ </xsl:call-template>
+ </td>
+ <td><xsl:apply-templates select="@timestamp"/></td>
+ <td><xsl:apply-templates select="@hostname"/></td>
+ </tr>
+</xsl:template>
+
+<xsl:template match="testcase" mode="print.test">
+ <tr valign="top">
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="failure | error">Error</xsl:when>
+ </xsl:choose>
+ </xsl:attribute>
+ <td><xsl:value-of select="@name"/></td>
+ <xsl:choose>
+ <xsl:when test="failure">
+ <td>Failure</td>
+ <td><xsl:apply-templates select="failure"/></td>
+ </xsl:when>
+ <xsl:when test="error">
+ <td>Error</td>
+ <td><xsl:apply-templates select="error"/></td>
+ </xsl:when>
+ <xsl:otherwise>
+ <td>Success</td>
+ <td></td>
+ </xsl:otherwise>
+ </xsl:choose>
+ <td>
+ <xsl:call-template name="display-time">
+ <xsl:with-param name="value" select="@time"/>
+ </xsl:call-template>
+ </td>
+ </tr>
+</xsl:template>
+
+
+<xsl:template match="failure">
+ <xsl:call-template name="display-failures"/>
+</xsl:template>
+
+<xsl:template match="error">
+ <xsl:call-template name="display-failures"/>
+</xsl:template>
+
+<!-- Style for the error and failure in the tescase template -->
+<xsl:template name="display-failures">
+ <xsl:choose>
+ <xsl:when test="not(@message)">N/A</xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@message"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <!-- display the stacktrace -->
+ <code>
+ <br/><br/>
+ <xsl:call-template name="br-replace">
+ <xsl:with-param name="word" select="."/>
+ </xsl:call-template>
+ </code>
+ <!-- the later is better but might be problematic for non-21"
monitors... -->
+ <!--pre><xsl:value-of select="."/></pre-->
+</xsl:template>
+
+<xsl:template name="JS-escape">
+ <xsl:param name="string"/>
+ <xsl:param name="tmp1"
select="stringutils:replace(string($string),'\','\\')"/>
+ <xsl:param name="tmp2"
select="stringutils:replace(string($tmp1),"'","\'")"/>
+ <xsl:value-of select="$tmp2"/>
+</xsl:template>
+
+
+<!--
+ template that will convert a carriage return into a br tag
+ @param word the text from which to convert CR to BR tag
+-->
+<xsl:template name="br-replace">
+ <xsl:param name="word"/>
+ <xsl:choose>
+ <xsl:when test="contains($word, '
')">
+ <xsl:value-of select="substring-before($word, '
')"/>
+ <br/>
+ <xsl:call-template name="br-replace">
+ <xsl:with-param name="word"
select="substring-after($word, '
')"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$word"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+<xsl:template name="display-time">
+ <xsl:param name="value"/>
+ <xsl:value-of select="format-number($value,'0.000')"/>
+</xsl:template>
+
+<xsl:template name="display-percent">
+ <xsl:param name="value"/>
+ <xsl:value-of select="format-number($value,'0.00%')"/>
+</xsl:template>
+
+</xsl:stylesheet>
=======================================
--- /dev/null
+++ /trunk/user/style/text/junit-noframes.xsl Mon Jan 17 09:08:08 2011
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
version="1.0"
+ xmlns:lxslt="http://xml.apache.org/xslt";
+ xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils">
+<xsl:output method="text" indent="no" encoding="UTF-8" />
+<xsl:decimal-format decimal-separator="." grouping-separator="," />
+<!--
+ 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.
+ -->
+
+<xsl:param name="TITLE">JSR-303 TCK report</xsl:param>
+
+<!--
+
+ Modified from the default stylesheet.
+ Changed so counts are relative to the TOTAL tests in the TCK
+
+-->
+
+<xsl:param name="markedFailing" />
+<xsl:param name="markedNonTckTest" />
+<xsl:param name="markedNotSupported" />
+<xsl:template match="testsuites">
+
+ <xsl:variable name="rawTestCount" select="258"/>
+ <!--
+ rawTestCount from
+ jar -xf jsr303-tck-1.0.3.GA-sources.jar
+ grep -r \@Test org/hibernate/jsr303/tck/tests/| grep -v "enabled =
false" | wc -l
+ -->
+ <xsl:variable name="testCount" select="($rawTestCount -
$markedNotSupported)"/>
+ <xsl:variable name="testExecutedCount" select="sum(testsuite/@tests)"/>
+ <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
+ <xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
+ <xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
+ <xsl:variable name="passedCount" select="($testExecutedCount -
$failureCount - $errorCount)"/>
+ <xsl:variable name="successRate" select="($passedCount) div
$testCount"/>
+ <xsl:if test="($failureCount + $errorCount) != ($markedFailing)">
+ <xsl:text>WARINING expected Failures + Errors to match the
</xsl:text>
+ <xsl:value-of select="$markedFailing" />
+ <xsl:text> test marked @Failing
+</xsl:text>
+ </xsl:if>
+ <xsl:value-of select="$passedCount" /> <xsl:text> of </xsl:text>
+ <xsl:value-of select="$testCount"/> <xsl:text> (</xsl:text>
+ <xsl:call-template name="display-percent">
+ <xsl:with-param name="value" select="$successRate"/>
+ </xsl:call-template>
+ <xsl:text>) Pass with </xsl:text>
+ <xsl:value-of select="$failureCount"/> <xsl:text> Failures and
</xsl:text>
+ <xsl:value-of select="$errorCount" /> <xsl:text> Errors.</xsl:text>
+</xsl:template>
+
+<xsl:template name="display-percent">
+ <xsl:param name="value"/>
+ <xsl:value-of select="format-number($value,'0.00%')"/>
+</xsl:template>
+
+</xsl:stylesheet>
=======================================
--- /trunk/common.ant.xml Thu Oct 7 07:43:12 2010
+++ /trunk/common.ant.xml Mon Jan 17 09:08:08 2011
@@ -128,6 +128,15 @@
<pathelement location="${gwt.tools.antlib}/ant-contrib-1.0b3.jar" />
</classpath>
</taskdef>
+
+
+ <!-- Pulls in tasks defined in antcount, i.e. countfilter -->
+ <taskdef resource="net/sf/antcount/antlib.xml">
+ <classpath>
+ <pathelement location="${gwt.tools.antlib}/antcount-1.2.jar" />
+ </classpath>
+ </taskdef>
+
<!-- Global Custom Tasks -->
<presetdef name="gwt.ant">
=======================================
--- /trunk/user/build.xml Tue Jan 11 14:19:47 2011
+++ /trunk/user/build.xml Mon Jan 17 09:08:08 2011
@@ -31,6 +31,9 @@
<property name="benchmark.timeout" value="30" />
<property name="gwt.benchmark.testcase.web.includes"
value="${gwt.benchmark.testcase.includes}" />
<property name="gwt.benchmark.testcase.web.excludes"
value="${gwt.benchmark.testcase.excludes}" />
+
+ <property name="gwt.tck.testcase.dev.includes"
value="com/google/gwt/validation/tck/**/*GwtSuite.class" />
+ <property name="gwt.tct.testcase.dev.excludes" value="" />
<!--
Test args can be specified per test target type.
@@ -638,7 +641,113 @@
</parallel>
</limit>
</target>
-
+
+
+ <!-- Validation TCK test and reports -->
+
+ <!-- TODO(nchalko) move the tck target to user/build.xml and then delete
+ all of samples/validaitontck -->
+ <target name="tck"
+ depends="tck.run,tck.report"
+ description="Run all tests for this project.">
+ <fail
+ message="One or more junit tests failed for target: @{test.name}
@{test.args}"
+ if="junit.failure" status="2" />
+ </target>
+
+ <target name="tck.run"
+ depends="compile, compile.tests"
+ description="Run all tests for this project.">
+ <!-- Prevent compilation for every target. -->
+ <property name="compile.complete" value="true"/>
+ <property name="compile.tests.complete" value="true"/>
+
+ <property.ensure name="distro.built"
location="${gwt.dev.staging.jar}"
+ message="GWT must be built before performing any tests. This
can be fixed by running ant in the ${gwt.root} directory." />
+ <limit failonerror="true" hours="${test.timeout}">
+
+ <antcall target="tck.dev.htmlunit"/>
+ </limit>
+
+ <fail
+ message="One or more tck tests failed for target: @{test.name}
@{test.args}"
+ if="junit.failure" status="2" />
+ </target>
+
+ <macrodef name="countMarkedTests">
+ <attribute name="annotation" default="NOT SET" />
+ <attribute name="outputproperty"
default="jsr303.marked.@{annotation}" />
+ <sequential>
+
+ </sequential>
+ </macrodef>
+
+ <target name="tck.report">
+ <mkdir dir="${junit.out}/tck-report" />
+ <mkdir dir="${junit.out}/tck-report/text" />
+
+ <scan>
+ <fileset dir="test/org/hibernate/jsr303/tck/tests" id="id"/>
+ <filterchain>
+ <countfilter match="@Failing" property="jsr303.marked.Failing"
init="0"/>
+ <countfilter match="@NonTckTest"
property="jsr303.marked.NonTckTest" init="0"/>
+ <countfilter match="@NotSupported"
property="jsr303.marked.NotSupported" init="0"/>
+ </filterchain>
+ </scan>
+
+ <!-- force to zero if not set above -->
+ <property name="jsr303.marked.Failing" value="0"/>
+ <property name="jsr303.marked.NonTckTest" value="0"/>
+ <property name="jsr303.marked.NotSupported" value="0"/>
+
+ <echo message="Marked Failing = ${jsr303.marked.Failing}" />
+ <echo message="Marked NonTckTest = ${jsr303.marked.NonTckTest}" />
+ <echo message="Marked NotSupported = ${jsr303.marked.NotSupported}"
/>
+
+ <junitreport todir="${junit.out}/tck-report">
+ <fileset dir="${junit.out}/tck-dev-htmlunit">
+ <include name="reports/TEST-*.xml" />
+ </fileset>
+ <report format="noframes" todir="${junit.out}/tck-report"
styledir="style/html">
+ <param name="markedFailing"
expression="${jsr303.marked.Failing}" />
+ <param name="markedNonTckTest"
expression="${jsr303.marked.NonTckTest}" />
+ <param name="markedNotSupported"
expression="${jsr303.marked.NotSupported}" />
+ </report>
+ <report format="noframes" todir="${junit.out}/tck-report/text"
styledir="style/text">
+ <param name="markedFailing"
expression="${jsr303.marked.Failing}" />
+ <param name="markedNonTckTest"
expression="${jsr303.marked.NonTckTest}" />
+ <param name="markedNotSupported"
expression="${jsr303.marked.NotSupported}" />
+ </report>
+ </junitreport>
+
+ <concat taskname="JSR 303 TCK Result">
+ <filelist>
+ <file name="${junit.out}/tck-report/text/junit-noframes.html" />
+ </filelist>
+ </concat>
+
+ </target>
+
+ <target name="tck.dev.htmlunit"
+ depends="compile, compile.tests"
+ description="Run dev-mode tests with HtmlUnit."
+ unless="test.dev.htmlunit.disable">
+ <fileset id="tck.dev.htmlunit.tests" dir="${javac.junit.out}"
+ includes="${gwt.tck.testcase.dev.includes}"
+ excludes="${gwt.tck.testcase.dev.excludes}" />
+ <gwt.junit test.name="test.dev.htmlunit"
+ test.args="${test.args} -standardsMode "
+ test.jvmargs="-ea
-Dcom.google.gwt.sample.validationtck.util.Failing.include=true
-Dcom.google.gwt.sample.validationtck.util.NonTckTest.exclude=true"
+ test.out="${junit.out}/tck-dev-htmlunit"
+ test.cases="tck.dev.htmlunit.tests"
+ haltonfailure="false"
+ >
+ <extraclasspaths>
+ <path refid="test.extraclasspath" />
+ </extraclasspaths>
+ </gwt.junit>
+ </target>
+
<target name="benchmark"
description="Run all benchmarks for this project.">
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
