larryi 01/01/27 10:39:33
Modified: src/admin/WEB-INF/classes/tadm GTestTEI.java GTestTag.java
src/admin/test test.jsp
Log:
Update GTestTag to add a gtestTestRevision attribute that retrieves the
"revision" property from the test file, if present. If not present, it is defaulted
to "Revision: Unknown".
Add a line like the following as a global property to the test file to set the
revision:
<property name="revision" value="Revision: 1.0" />
Handling is provided to remove the '$' characters if the CVS key substitution
$Revsion$ is used.
Updated test.jsp to display the revision.
Revision Changes Path
1.3 +3 -0 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/GTestTEI.java
Index: GTestTEI.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/GTestTEI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GTestTEI.java 2001/01/21 20:10:38 1.2
+++ GTestTEI.java 2001/01/27 18:39:33 1.3
@@ -20,6 +20,9 @@
public VariableInfo[] getVariableInfo(TagData data) {
return (new VariableInfo[] {
+ new VariableInfo("gtestTestRevision",
+ "java.lang.String",
+ true, VariableInfo.AT_BEGIN),
new VariableInfo("gtestTestResults",
"java.util.Vector",
true, VariableInfo.AT_BEGIN),
1.7 +13 -0 jakarta-tomcat/src/admin/WEB-INF/classes/tadm/GTestTag.java
Index: GTestTag.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/WEB-INF/classes/tadm/GTestTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GTestTag.java 2001/01/22 16:42:05 1.6
+++ GTestTag.java 2001/01/27 18:39:33 1.7
@@ -18,6 +18,7 @@
*/
public class GTestTag extends TagSupport {
PageContext pageContext;
+ String revision;
public GTestTag() {}
@@ -37,6 +38,8 @@
runTest( base );
+ pageContext.setAttribute("gtestTestRevision",
+ revision);
pageContext.setAttribute("gtestTestResults",
GTest.getTestResults());
pageContext.setAttribute("gtestTestFailures",
@@ -145,6 +148,16 @@
project.setUserProperty( "wgdir", base + "/Golden");
ProjectHelper.configureProject( project, testFile );
+
+ // try to get revision if present
+ revision = project.getProperty( "revision" );
+ if (revision == null)
+ revision = "Revision: Unknown";
+ else {
+ // clean up a little in case CVS $Revision: 1.7 $ used
+ revision = revision .replace('$',' ');
+ revision .trim();
+ }
Vector targets=new Vector();
if( target==null ) target="client";
1.6 +2 -0 jakarta-tomcat/src/admin/test/test.jsp
Index: test.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/admin/test/test.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- test.jsp 2001/01/24 01:47:24 1.5
+++ test.jsp 2001/01/27 18:39:33 1.6
@@ -54,6 +54,8 @@
// it's done ), use 'html' for "interactive" results
%>
+<h1>Test <%= gtestTestRevision %></h1>
+
<% // -------------------- Failures -------------------- %>
<h1>FAILED Tests</h1>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
