morgand 01/08/31 13:11:36
Modified: latka-webapp/webapp SetTestDir.jsp TestForm.jsp TestMenu.jsp
Added: latka-webapp/webapp ProcessTestBody.jsp ProcessTestFile.jsp
RunTestFile.jsp SetProperties.jsp
Removed: latka-webapp/webapp ProcessTest.jsp RunTest.jsp
RunTestURI.jsp
Log:
general refactoring, including new tags for getting and setting Latka properties
Revision Changes Path
1.2 +4 -6 jakarta-commons-sandbox/latka-webapp/webapp/SetTestDir.jsp
Index: SetTestDir.jsp
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/latka-webapp/webapp/SetTestDir.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetTestDir.jsp 2001/08/28 21:16:15 1.1
+++ SetTestDir.jsp 2001/08/31 20:11:36 1.2
@@ -1,10 +1,8 @@
-<%@ page import="java.util.Properties,org.apache.commons.latka.LatkaProperties" %>
+<%@ taglib uri="http://jakarta.apache.org/taglibs/latka-taglib"; prefix="latka" %>
+<latka:sessionProperties id="props"/>
-<%
- Properties props = (Properties) session.getAttribute("latka.sessionProperties");
- props.setProperty("latka.testDir",
- request.getParameter("testDir"));
-%>
+<% props.setProperty("latka.testDir",
+ request.getParameter("testDir")); %>
<jsp:forward page="TestMenu.jsp"/>
1.2 +2 -2 jakarta-commons-sandbox/latka-webapp/webapp/TestForm.jsp
Index: TestForm.jsp
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/latka-webapp/webapp/TestForm.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestForm.jsp 2001/08/29 23:16:47 1.1
+++ TestForm.jsp 2001/08/31 20:11:36 1.2
@@ -1,8 +1,8 @@
<h2>Run a Latka test</h2>
-<form method="post" action="ProcessTest.jsp">
+<form method="post" action="ProcessTestBody.jsp">
-<textarea NAME="latkaTest" ROWS="18" COLS="70">
+<textarea NAME="testBody" ROWS="18" COLS="70">
<?xml version="1.0"?>
<suite defaultHost="localhost" defaultPort="8080" label="Latka self-diagnostics">
1.4 +6 -14 jakarta-commons-sandbox/latka-webapp/webapp/TestMenu.jsp
Index: TestMenu.jsp
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/latka-webapp/webapp/TestMenu.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestMenu.jsp 2001/08/29 23:16:47 1.3
+++ TestMenu.jsp 2001/08/31 20:11:36 1.4
@@ -1,18 +1,10 @@
-<%@ page import="java.util.Properties,org.apache.commons.latka.LatkaProperties" %>
<%@ taglib uri="http://jakarta.apache.org/taglibs/latka-taglib"; prefix="latka" %>
+<latka:sessionProperties id="props"/>
+
<%
- Properties props = (Properties) session.getAttribute("latka.sessionProperties");
- if (props == null) {
- props = (Properties) LatkaProperties.getProperties().clone();
- session.setAttribute("latka.sessionProperties",props);
- }
- String testDir = props.getProperty("latka.testDir");
- if (testDir == null) {
- testDir = application.getInitParameter("latka.testDir");
- props.setProperty("latka.testDir",
- testDir);
- }
+ String testDir = props.getProperty("latka.testDir",
+ application.getInitParameter("latka.testDir"));
%>
<html>
@@ -33,8 +25,8 @@
<latka:listTests id="files" testDir="<%= testDir %>"/>
<% for (int i = 0; i < files.length; ++i) { %>
- <% String fileName = props.getProperty("latka.testDir") + "/" +
files[i].getName(); %>
- <form action="ProcessTest.jsp" method="post">
+ <% String fileName = testDir + "/" + files[i].getName(); %>
+ <form action="ProcessTestFile.jsp" method="post">
<input type="hidden" name="testFile" value="<%= fileName %>">
<input type="submit" value="Run Test">
<%= files[i].getName() %>
1.1 jakarta-commons-sandbox/latka-webapp/webapp/ProcessTestBody.jsp
Index: ProcessTestBody.jsp
===================================================================
<%@ page import="java.util.Iterator" %>
<%@ taglib uri="http://jakarta.apache.org/taglibs/latka-taglib";
prefix="latka" %>
<latka:findVariables id="set">
<%= request.getParameter("latkaTest") %>
</latka:findVariables>
<%
Iterator i = set.iterator();
if (i.hasNext() == false) {
%>
<jsp:forward page="RunTestBody.jsp"/>
<%
}
while (i.hasNext()) {
%>
VarName: <%= i.next() %>
<% } %>
1.1 jakarta-commons-sandbox/latka-webapp/webapp/ProcessTestFile.jsp
Index: ProcessTestFile.jsp
===================================================================
<%@ page import="java.util.Iterator" %>
<%@ taglib uri="http://jakarta.apache.org/taglibs/latka-taglib";
prefix="latka" %>
<% String testFile = request.getParameter("testFile"); %>
<latka:findVariables id="set"
testFile="<%= testFile %>"/>
<% Iterator i = set.iterator();
if (i.hasNext() == false) {
%>
<jsp:forward page="RunTestFile.jsp"/>
<% } %>
<p>These variables must be set before running the test:</p>
<latka:sessionProperties id="props"/>
<form method="post" action="SetProperties.jsp">
<input type="hidden" name="testFile" value="<%= testFile %>">
<% while (i.hasNext()) {
String property = (String) i.next(); %>
<p>
<%= property %>:
<input type="text" name="latka.property.<%= property %>"
value="<%= props.getProperty(property, "[no default value]") %>">
<% } %>
<p><input type="submit" value="Set variables and execute test">
</form>
1.1 jakarta-commons-sandbox/latka-webapp/webapp/RunTestFile.jsp
Index: RunTestFile.jsp
===================================================================
<%@ taglib uri="http://jakarta.apache.org/taglibs/latka-taglib"; prefix="latka" %>
<latka:sessionProperties id="props"/>
<% String fileName = request.getParameter("testFile"); %>
<pre>
<latka:executeSuite testFile="<%= fileName %>" properties="props"/>
</pre>
<a href="TestMenu.jsp">[Return to test menu]</a>
1.1 jakarta-commons-sandbox/latka-webapp/webapp/SetProperties.jsp
Index: SetProperties.jsp
===================================================================
<%@ taglib uri="http://jakarta.apache.org/taglibs/latka-taglib";
prefix="latka" %>
<latka:sessionProperties id="props"/>
<latka:setPropertiesFromRequest properties="props"/>
<% if (request.getParameter("testFile") != null) { %>
<jsp:forward page="RunTestFile.jsp"/>
<% } else { %>
<jsp:forward page="RunTestBody.jsp"/>
<% } %>
