Update of /cvsroot/jwebunit/jWebUnit/fitplugin/test/net/sourceforge/jwebunit/fit
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1170/fitplugin/test/net/sourceforge/jwebunit/fit
Modified Files:
WebFixtureTest.java
Log Message:
Fixed the last old test. Now all tests run with the bundled fit.jar and
fit-1.0.jar.
Index: WebFixtureTest.java
===================================================================
RCS file:
/cvsroot/jwebunit/jWebUnit/fitplugin/test/net/sourceforge/jwebunit/fit/WebFixtureTest.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** WebFixtureTest.java 3 Jan 2006 16:41:18 -0000 1.25
--- WebFixtureTest.java 5 Jan 2006 07:23:53 -0000 1.26
***************
*** 17,26 ****
import org.mortbay.http.HttpContext;
- import org.mortbay.http.HttpException;
- import org.mortbay.http.HttpRequest;
- import org.mortbay.http.HttpResponse;
import org.mortbay.http.HttpServer;
import org.mortbay.http.SocketListener;
- import org.mortbay.http.handler.DumpHandler;
import org.mortbay.http.handler.ResourceHandler;
import org.mortbay.jetty.servlet.ServletHandler;
--- 17,22 ----
***************
*** 47,51 ****
oldUrls = new HashMap();
oldUrls.put("/colorForm", "/ColorForm.html");
! oldUrls.put("/moriaDoorForm", "/MoriaDoorForm.html");
oldUrls.put("/personalInfoForm", "/PersonalInfoForm.html");
oldUrls.put("/sampleMenu", "/SampleMenu.html");
--- 43,47 ----
oldUrls = new HashMap();
oldUrls.put("/colorForm", "/ColorForm.html");
! oldUrls.put("/enterMoria", "/MoriaDoorForm.html");
oldUrls.put("/personalInfoForm", "/PersonalInfoForm.html");
oldUrls.put("/sampleMenu", "/SampleMenu.html");
***************
*** 80,84 ****
public void testWebFixture() throws Exception {
- //new PseudoWebApp();
// avoid the need of the system property, always use .fit files for
input
RunnerUtility.overrideSystemPropertyAndUseWikiParser = true;
--- 76,79 ----
***************
*** 145,151 ****
private ResourceHandler getStaticHTMLResourceHandler() {
ResourceHandler handler = new ResourceHandler() {
protected Resource getResource(String pathInContext) throws
IOException {
Resource r = super.getResource(pathInContext);
! if (!r.exists() && oldUrls.containsKey(pathInContext)) { //
don't want to update the .fit files until the old tests work
r =
super.getResource(oldUrls.get(pathInContext).toString());
}
--- 140,148 ----
private ResourceHandler getStaticHTMLResourceHandler() {
ResourceHandler handler = new ResourceHandler() {
+ private static final long serialVersionUID = 1L;
protected Resource getResource(String pathInContext) throws
IOException {
Resource r = super.getResource(pathInContext);
! // don't want to update the .fit files until the old tests
work
! if (!r.exists() && oldUrls.containsKey(pathInContext)) {
r =
super.getResource(oldUrls.get(pathInContext).toString());
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Jwebunit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
