Author: husted
Date: Thu Nov 24 08:38:59 2005
New Revision: 348769
URL: http://svn.apache.org/viewcvs?rev=348769&view=rev
Log:
Update the webtests for version 1.7. Add a couple of missing body tags to JSPs
(thanks IDEA!).
Added:
struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/taskdef.xml
Modified:
struts/apps/trunk/mailreader/src/webapp/Registration.jsp
struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/config-debug.xml
struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/config-tidy.xml
struts/apps/trunk/mailreader/src/webapp/WEB-INF/webtest.properties.sample
struts/apps/trunk/mailreader/src/webapp/WEB-INF/webtest.xml
struts/apps/trunk/mailreader/src/webapp/logon.jsp
struts/apps/trunk/mailreader/src/webapp/mainMenu.jsp
struts/apps/trunk/mailreader/src/webapp/staticJavascript.jsp
Modified: struts/apps/trunk/mailreader/src/webapp/Registration.jsp
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/webapp/Registration.jsp?rev=348769&r1=348768&r2=348769&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/webapp/Registration.jsp (original)
+++ struts/apps/trunk/mailreader/src/webapp/Registration.jsp Thu Nov 24
08:38:59 2005
@@ -1,5 +1,5 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/tags/app" prefix="app" %>
+<%@ taglib uri="/tags/app" prefix="app" %>
<%@ taglib uri="http://struts.apache.org/tags-bean"; prefix="bean" %>
<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
<%@ taglib uri="http://struts.apache.org/tags-logic"; prefix="logic" %>
Modified:
struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/config-debug.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/config-debug.xml?rev=348769&r1=348768&r2=348769&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/config-debug.xml
(original)
+++ struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/config-debug.xml
Thu Nov 24 08:38:59 2005
@@ -2,11 +2,9 @@
host="localhost"
port="8080"
protocol="http"
- basepath="example"
+ basepath="struts-mailreader"
summary="true"
saveresponse="true"
resultpath="results"
resultfile="result.txt"
- showhtmlparseroutput="true"
- verbose="true"/>
-
+ showhtmlparseroutput="true"/>
Modified:
struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/config-tidy.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/config-tidy.xml?rev=348769&r1=348768&r2=348769&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/config-tidy.xml
(original)
+++ struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/config-tidy.xml
Thu Nov 24 08:38:59 2005
@@ -7,5 +7,4 @@
saveresponse="false"
resultpath="results"
resultfile="result.txt"
- showhtmlparseroutput="true"
- verbose="false"/>
+ showhtmlparseroutput="true"/>
Added: struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/taskdef.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/taskdef.xml?rev=348769&view=auto
==============================================================================
--- struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/taskdef.xml (added)
+++ struts/apps/trunk/mailreader/src/webapp/WEB-INF/entities/taskdef.xml Thu
Nov 24 08:38:59 2005
@@ -0,0 +1,22 @@
+<?xml version="1.0" ?>
+<project name="taskdef">
+ <description>
+ This project provides following elements to use in your test scripts:
+
+ (0) all webtest's steps loaded and ready to use,
+ (1) the path "webtest.path.id" that includes all of webtest's
libraries,
+ (2) the class loader "webtest.loader" that is the original loader for
webtest.
+
+ Usage:
+ Set the property webtest.home to the directory in which the build.zip
is extracted,
+ and calls:
+ <import file="${webtest.home}/lib/taskdef.xml" >
+ </description>
+
+ <import file="${webtest.home}/lib/classpath.xml" />
+
+ <taskdef resource="webtest.taskdef"
+ loaderref="webtest.loader"
+ classpathref="webtest.path.id"
+ />
+</project>
\ No newline at end of file
Modified:
struts/apps/trunk/mailreader/src/webapp/WEB-INF/webtest.properties.sample
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/webapp/WEB-INF/webtest.properties.sample?rev=348769&r1=348768&r2=348769&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/webapp/WEB-INF/webtest.properties.sample
(original)
+++ struts/apps/trunk/mailreader/src/webapp/WEB-INF/webtest.properties.sample
Thu Nov 24 08:38:59 2005
@@ -8,4 +8,4 @@
#
# $Id$
# -----------------------------------------------------------------------------
-webtest.home = /opt/Canoo/build_379
+webtest.home = /opt/Canoo/webtest-1.7
\ No newline at end of file
Modified: struts/apps/trunk/mailreader/src/webapp/WEB-INF/webtest.xml
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/webapp/WEB-INF/webtest.xml?rev=348769&r1=348768&r2=348769&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/webapp/WEB-INF/webtest.xml (original)
+++ struts/apps/trunk/mailreader/src/webapp/WEB-INF/webtest.xml Thu Nov 24
08:38:59 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "WebTest.dtd" [
- <!ENTITY config SYSTEM "entities/config-debug.xml">
- <!ENTITY taskdef-webtest SYSTEM "entities/taskdef-webtest.xml">
+ <!DOCTYPE project SYSTEM "entities/WebTest.dtd" [
+ <!ENTITY config SYSTEM "entities/config-debug.xml">
+ <!ENTITY taskdef-webtest SYSTEM "entities/taskdef.xml">
]>
<!--
$Header: /home/cvs/jakarta-struts/web/example/WEB-INF/webtest.xml,v 1.2
2004/03/12 02:44:34 husted Exp $
@@ -46,14 +46,15 @@
<property file="webtest.properties"/>
<property name="webtest.home"
- location="/opt/Canoo/build_379" />
+ location="/opt/Canoo/webtest-1.7" />
<!-- Load application resources -->
- <property
file="../../../src/example/org/apache/struts/webapp/example/ApplicationResources.properties"/>
+ <property
file="../../java/org/apache/struts/apps/mailreader/resources/ApplicationResources.properties"/>
- <taskdef file="${webtest.home}/webtestTaskdefs.properties">
+ <taskdef file="C:/opt/Canoo/webtest-1.7/webtestTaskdefs.properties">
<classpath>
<fileset dir="${webtest.home}" includes="**/lib/*.jar"/>
+ <fileset dir="${webtest.home}" includes="**/lib/runtime/*.jar"/>
</classpath>
</taskdef>
@@ -62,84 +63,80 @@
<target name="welcome"
description="Welcome page">
- <testSpec name="Open welcome action">
+ <webtest name="Open welcome action">
&config;
<steps>
<invoke
- stepid="Open welcome action"
- url="/welcome.do" />
+ description="Open welcome action"
+ url="Welcome.do" />
<verifytitle
- stepid="Welcome page title"
+ description="Welcome page title"
text="${index.title}" />
<clicklink label="${index.registration}" />
<verifytitle
- stepid="Registration page title"
+ description="Registration page title"
text="${registration.title.create}" />
<clicklink label="${index.title}" />
<clicklink label="${index.logon}" />
<verifytitle
- stepid="Logon page title"
+ description="Logon page title"
text="${logon.title}" />
<clicklink label="${index.title}" />
</steps>
- </testSpec>
+ </webtest>
</target>
<target name="logon"
description="Logon page">
- <testSpec name="Open logon action">
+ <webtest name="Open logon action">
&config;
<steps>
<invoke
- stepid="Pass logon"
- url="/logon.do" />
+ description="Pass logon"
+ url="Logon.do" />
<verifytitle
- stepid="Logon page title"
+ description="Logon page title"
text="${logon.title}" />
<setinputfield
- stepid="username"
+ description="username"
name="username"
value="user" />
<setinputfield
- stepid="password"
+ description="password"
name="password"
value="pass" />
<clickbutton
- stepid="Submit"
- name="Submit">
- <form name="logonForm" />
- </clickbutton>
+ description="Submit"
+ name="Submit"/>
</steps>
- </testSpec>
+ </webtest>
- <testSpec name="Fail logon">
+ <webtest name="Fail logon">
&config;
<steps>
<invoke
- stepid="Open logon action"
- url="/logon.do" />
+ description="Open logon action"
+ url="Logon.do" />
<verifytitle
- stepid="Logon page title"
+ description="Logon page title"
text="${logon.title}" />
<setinputfield
- stepid="username"
+ description="username"
name="username"
value="xxxx" />
<setinputfield
- stepid="password"
+ description="password"
name="password"
value="xxxx" />
<clickbutton
- stepid="Submit"
- name="Submit">
- <form name="logonForm" />
- </clickbutton>
+ description="Submit"
+ name="Submit"/>
<verifytitle
- stepid="Logon page title"
+ description="Logon page title"
text="${logon.title}" />
</steps>
- </testSpec>
+ </webtest>
</target>
</project>
Modified: struts/apps/trunk/mailreader/src/webapp/logon.jsp
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/webapp/logon.jsp?rev=348769&r1=348768&r2=348769&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/webapp/logon.jsp (original)
+++ struts/apps/trunk/mailreader/src/webapp/logon.jsp Thu Nov 24 08:38:59 2005
@@ -7,7 +7,7 @@
<head>
<title><bean:message key="logon.title"/></title>
</head>
-
+<body>
<html:errors/>
<html:form action="/SubmitLogon" focus="username"
Modified: struts/apps/trunk/mailreader/src/webapp/mainMenu.jsp
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/webapp/mainMenu.jsp?rev=348769&r1=348768&r2=348769&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/webapp/mainMenu.jsp (original)
+++ struts/apps/trunk/mailreader/src/webapp/mainMenu.jsp Thu Nov 24 08:38:59
2005
@@ -8,6 +8,7 @@
<title><bean:message key="mainMenu.title"/></title>
<link rel="stylesheet" type="text/css" href="base.css" />
</head>
+<body>
<h3><bean:message key="mainMenu.heading"/> <bean:write name="user"
property="fullName" /></h3>
<ul>
<li><html:link action="/EditRegistration?action=Edit"><bean:message
key="mainMenu.registration"/></html:link></li>
Modified: struts/apps/trunk/mailreader/src/webapp/staticJavascript.jsp
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/webapp/staticJavascript.jsp?rev=348769&r1=348768&r2=348769&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/webapp/staticJavascript.jsp (original)
+++ struts/apps/trunk/mailreader/src/webapp/staticJavascript.jsp Thu Nov 24
08:38:59 2005
@@ -1,7 +1,4 @@
-<%@ page language="java" %>
-<%-- set document type to Javascript (addresses a bug in Netscape according to
a web resource --%>
-<%@ page contentType="application/x-javascript" %>
-
+<%@ page contentType="application/x-javascript" language="java" %>
+<%-- set document type to Javascript addresses a bug in Netscape according to
a web resource --%>
<%@ taglib uri="http://struts.apache.org/tags-html"; prefix="html" %>
-
<html:javascript dynamicJavascript="false" staticJavascript="true"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
