Return-Path: 
 <ant-dev-return-17218-apmail-jakarta-ant-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@jakarta.apache.org
Received: (qmail 40247 invoked by uid 500); 28 Aug 2001 22:43:14 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ant-dev@jakarta.apache.org
list-help: <mailto:ant-dev-help@jakarta.apache.org>
list-unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
list-post: <mailto:ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 40221 invoked from network); 28 Aug 2001 22:43:13 -0000
Message-ID: <03c101c13012$fc4bb890$5614000a@GILAMONSTER>
From: "Erik Hatcher" <erikhatcher@earthlink.net>
To: <ant-dev@jakarta.apache.org>
References: <20010828210833.44515.qmail@icarus.apache.org>
 <033101c13007$1ba1fdf0$5614000a@GILAMONSTER>
Subject: [PATCH] junit-frames.xsl - nicer display of properties
Date: Tue, 28 Aug 2001 15:44:23 -0700
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="----=_NextPart_000_03BE_01C12FD8.4F4025D0"
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 5.00.3018.1300
X-MimeOLE: Produced By Microsoft MimeOLE V5.00.3018.1300
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

This is a multi-part message in MIME format.

------=_NextPart_000_03BE_01C12FD8.4F4025D0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

Stephane - here ya go for the frames version.

    Erik


----- Original Message -----
From: "Erik Hatcher" <erikhatcher@earthlink.net>
To: <ant-dev@jakarta.apache.org>
Sent: Tuesday, August 28, 2001 2:19 PM
Subject: Re: cvs commit: jakarta-ant/src/etc junit-noframes.xsl


> Stephane,
>
> Since you're happy enough with those changes to commit them then I'll go
> ahead and replicate the changes to the junit-frames.xsl and submit a patch
> for that, so both have it in Ant 1.4.
>
> Thanks,
>     Erik
>
>
> ----- Original Message -----
> From: <sbailliez@apache.org>
> To: <jakarta-ant-cvs@apache.org>
> Sent: Tuesday, August 28, 2001 2:08 PM
> Subject: cvs commit: jakarta-ant/src/etc junit-noframes.xsl
>
>
> > sbailliez    01/08/28 14:08:33
> >
> >   Modified:    src/etc  Tag: ANT_14_BRANCH junit-noframes.xsl
> >   Log:
> >   Added changes done by Erik Hatcher <erik@hatcher.net> about
properties.
> >   It nows pops up a window to display system properties related to a
> testcase.
> >   I changed the original patch to have a named window w/o a toolbar and
> >   a status bar.
> >
> >   Revision  Changes    Path
> >   No                   revision
> >
> >
> >   No                   revision
> >
> >
> >   1.1.2.3   +72 -41    jakarta-ant/src/etc/junit-noframes.xsl
> >
> >   Index: junit-noframes.xsl
> >   ===================================================================
> >   RCS file: /home/cvs/jakarta-ant/src/etc/junit-noframes.xsl,v
> >   retrieving revision 1.1.2.2
> >   retrieving revision 1.1.2.3
> >   diff -u -r1.1.2.2 -r1.1.2.3
> >   --- junit-noframes.xsl 2001/08/22 21:13:26 1.1.2.2
> >   +++ junit-noframes.xsl 2001/08/28 21:08:32 1.1.2.3
> >   @@ -22,25 +22,6 @@
> >          background:#eeeee0;
> >          }
> >
> >   -      table.properties {
> >   -      border-collapse:collapse;
> >   -      border-left:solid 1 #cccccc; border-top:solid 1 #cccccc;
> >   -      padding:5px;
> >   -      }
> >   -
> >   -      table.properties th {
> >   -        text-align:left;
> >   -      border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc;
> >   -      background-color:#eeeeee;
> >   -      }
> >   -
> >   -      table.properties td {
> >   -      font:normal;
> >   -      text-align:left;
> >   -      border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc;
> >   -      background-color:#fffffff;
> >   -      }
> >   -
> >          p {
> >          line-height:1.5em;
> >          margin-top:0.5em; margin-bottom:1.0em;
> >   @@ -69,12 +50,45 @@
> >          .Failure {
> >          font-weight:bold; color:purple;
> >          }
> >   +      .Properties {
> >   +      text-align:right;
> >   +      }
> >          </style>
> >   -      <script language="JavaScript"><![CDATA[
> >   -        function toggle (field)
> >   -        {
> >   -          field.style.display = (field.style.display == "block") ?
> "none" : "block";
> >   -        }  ]]>
> >   +      <script language="JavaScript">
> >   +        var TestCases = new Array();
> >   +        var cur;
> >   +        <xsl:for-each select="./testsuite">
> >   +            <xsl:apply-templates select="properties"/>
> >   +        </xsl:for-each>
> >   +
> >   +       </script>
> >   +       <script language="JavaScript"><![CDATA[
> >   +        function displayProperties (name) {
> >   +          var win =
> window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
> >   +          var doc = win.document.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>
> >   @@ -188,8 +202,13 @@
> >    </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 &gt;&gt;
> >   +     </a>
> >   +            </div>
> >    <p/>
> >   - <xsl:apply-templates select="properties"/>
> >
> >    <a href="#top">Back to top</a>
> >    </xsl:for-each>
> >   @@ -243,25 +262,15 @@
> >    </xsl:template>
> >
> >      <!--
> >   -   Simple way to display properties, it is not very nice but it does
> >   -   the job. Properties are sorted so that they can be found easily.
> >   +   Write properties into a JavaScript data structure.
> >       This is based on the original idea by Erik Hatcher
> (erik@hatcher.net)
> >       -->
> >      <xsl:template match="properties">
> >   -    <xsl:variable name="id"
> select="concat(translate(../@package,'.','_'),'_', ../@name)"/>
> >   -    <i><a href="javascript:toggle({$id});">Show/Hide System
Properties
> &gt;&gt;</a></i>
> >   -    <div id="{$id}" style="display:none">
> >   -    <table class="properties" border="0" cellpadding="5"
> cellspacing="2" width="95%">
> >   -      <xsl:for-each select="property">
> >   -        <xsl:sort select="@name"/>
> >   -    <tr valign="top">
> >   -    <th><xsl:value-of select="@name"/></th>
> >   -    <td><xsl:value-of select="@value"/></td>
> >   -    </tr>
> >   -      </xsl:for-each>
> >   -    </table>
> >   -    </div>
> >   -    <p/>
> >   +    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 -->
> >   @@ -389,6 +398,28 @@
> >    <!-- 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:choose><!-- something isn't right here, basically all single
> quotes need to be replaced with backslash-single-quote
> >   + <xsl:when test="contains($string,'&apos;')">
> >   + <xsl:value-of select="substring-before($string,'&apos;')"/>
> >   + \&apos;
> >   + <xsl:call-template name="JS-escape">
> >   + <xsl:with-param name="string"
> select="substring-after($string,'&apos;')"/>
> >   + </xsl:call-template>
> >   + </xsl:when> -->
> >   + <xsl:when test="contains($string,'\')">
> >   + <xsl:value-of
> select="substring-before($string,'\')"/>\\<xsl:call-template
> name="JS-escape">
> >   + <xsl:with-param name="string"
select="substring-after($string,'\')"/>
> >   + </xsl:call-template>
> >   + </xsl:when>
> >   + <xsl:otherwise>
> >   + <xsl:value-of select="$string"/>
> >   + </xsl:otherwise>
> >   + </xsl:choose>
> >   +</xsl:template>
> >   +
> >
> >    <!--
> >    template that will convert a carriage return into a br tag
> >
> >
> >
>

------=_NextPart_000_03BE_01C12FD8.4F4025D0
Content-Type: text/plain;
	name="patchfile.txt"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="patchfile.txt"

Index: junit-frames.xsl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvspublic/jakarta-ant/src/etc/junit-frames.xsl,v
retrieving revision 1.2.2.3
diff -u -r1.2.2.3 junit-frames.xsl
--- junit-frames.xsl	2001/08/22 21:13:26	1.2.2.3
+++ junit-frames.xsl	2001/08/28 22:40:08
@@ -136,25 +136,6 @@
 	background:#eeeee0;
 }
=20
-table.properties {
-	border-collapse:collapse;
-	border-left:solid 1 #cccccc; border-top:solid 1 #cccccc;
-	padding:5px;
-}
-
-table.properties th {
-  text-align:left;
-	border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc;
-	background-color:#eeeeee;
-}
-
-table.properties td {
-	font:normal;
-	text-align:left;
-	border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc;
-	background-color:#fffffff;
-}
-
 p {
 	line-height:1.5em;
 	margin-top:0.5em; margin-bottom:1.0em;
@@ -183,6 +164,9 @@
 .Failure {
 	font-weight:bold; color:purple;
 }
+.Properties {
+  text-align:right;
+}
 </xsl:template>
=20
=20
@@ -199,10 +183,38 @@
 				<xsl:with-param name=3D"package.name" select=3D"$package.name"/>
 			</xsl:call-template>
       <script language=3D"JavaScript">
-        function toggle (field) {
-          field.style.display =3D (field.style.display =3D=3D "block") =
? "none" : "block";
+        var TestCases =3D new Array();
+        var cur;
+        <xsl:apply-templates select=3D"properties"/>
+       </script>
+       <script language=3D"JavaScript"><![CDATA[
+        function displayProperties (name) {
+          var win =3D =
window.open('','JUnitSystemProperties','scrollbars=3D1,resizable=3D1');
+          var doc =3D win.document.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=3D\"right\"><a =
href=3D\"javascript:window.close();\">Close</a></div>");
+          doc.write("<table class=3D'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>		=09
+      ]]> =20
+      </script>
 		</head>
 		<body>
 			<xsl:call-template name=3D"pageHeader"/>=09
@@ -228,34 +240,28 @@
 				</xsl:if>
 				<xsl:apply-templates select=3D"./testcase" mode=3D"print.test"/>
 			</table>
-		=09
 			</p>
-			<xsl:apply-templates select=3D"properties"/>
+      <div class=3D"Properties">
+        <a>
+          <xsl:attribute =
name=3D"href">javascript:displayProperties('<xsl:value-of =
select=3D"@package"/>.<xsl:value-of =
select=3D"@name"/>');</xsl:attribute>
+          Properties &gt;&gt;
+        </a>
+      </div>
 		</body>
 	</html>
 </xsl:template>
=20
-<!--
- Simple way to display properties, it is not very nice but it does
- the job. Properties are sorted so that they can be found easily.
- This is based on the original idea by Erik Hatcher (erik@hatcher.net)
- -->
-<xsl:template match=3D"properties">
-  <xsl:variable name=3D"id" =
select=3D"concat(translate(../@package,'.','_'),'_', ../@name)"/>
-  <i><a href=3D"javascript:toggle({$id});">Show/Hide System Properties =
&gt;&gt;</a></i>
-  <div id=3D"{$id}" style=3D"display:none">
-	  <table class=3D"properties" border=3D"0" cellpadding=3D"5" =
cellspacing=3D"2" width=3D"95%">
-	    <xsl:for-each select=3D"property">
-      <xsl:sort select=3D"@name"/>
-		  <tr valign=3D"top">
-			  <th><xsl:value-of select=3D"@name"/></th>
-			  <td><xsl:value-of select=3D"@value"/></td>
-		  </tr>			 =20
-	    </xsl:for-each>
-	  </table>
-  </div>
-  <p/>
-</xsl:template>
+  <!--
+   Write properties into a JavaScript data structure.
+   This is based on the original idea by Erik Hatcher =
(erik@hatcher.net)
+   -->
+  <xsl:template match=3D"properties">
+    cur =3D TestCases['<xsl:value-of =
select=3D"../@package"/>.<xsl:value-of select=3D"../@name"/>'] =3D new =
Array();
+  	<xsl:for-each select=3D"property">
+    <xsl:sort select=3D"@name"/>
+        cur['<xsl:value-of select=3D"@name"/>'] =3D '<xsl:call-template =
name=3D"JS-escape"><xsl:with-param name=3D"string" =
select=3D"@value"/></xsl:call-template>';
+  	</xsl:for-each>
+  </xsl:template>
=20
=20
 <!-- =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -642,6 +648,28 @@
 	<!-- the latter is better but might be problematic for non-21" =
monitors... -->
 	<!--pre><xsl:value-of select=3D"."/></pre-->
 </xsl:template>
+
+<xsl:template name=3D"JS-escape">
+	<xsl:param name=3D"string"/>
+	<xsl:choose><!-- something isn't right here, basically all single =
quotes need to be replaced with backslash-single-quote
+		<xsl:when test=3D"contains($string,'&apos;')">
+			<xsl:value-of select=3D"substring-before($string,'&apos;')"/>
+			\&apos;
+			<xsl:call-template name=3D"JS-escape">
+				<xsl:with-param name=3D"string" =
select=3D"substring-after($string,'&apos;')"/>
+			</xsl:call-template>
+		</xsl:when> -->
+		<xsl:when test=3D"contains($string,'\')">
+			<xsl:value-of =
select=3D"substring-before($string,'\')"/>\\<xsl:call-template =
name=3D"JS-escape">
+				<xsl:with-param name=3D"string" =
select=3D"substring-after($string,'\')"/>
+			</xsl:call-template>
+		</xsl:when>
+		<xsl:otherwise>
+			<xsl:value-of select=3D"$string"/>
+		</xsl:otherwise>
+	</xsl:choose>
+</xsl:template>
+
=20
 <!--
 	template that will convert a carriage return into a br tag



------=_NextPart_000_03BE_01C12FD8.4F4025D0--