[Httpunit-commit] CVS: httpunit/test/com/meterware/servletunit WebXMLTest.java,1.3,1.4

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/test/com/meterware/servletunit
In directory usw-pr-cvs1:/tmp/cvs-serv5993/test/com/meterware/servletunit

Modified Files:
	WebXMLTest.java 
Log Message:
More refactoring

Index: WebXMLTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/servletunit/WebXMLTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebXMLTest.java	2001/12/03 15:42:39	1.3
+++ WebXMLTest.java	2002/01/01 19:29:08	1.4
@@ -177,14 +177,14 @@
         WebXMLString wxs = new WebXMLString();
         wxs.addServlet( "/Logon", SimpleLogonServlet.class );
         wxs.addServlet( "/Error", SimpleErrorServlet.class );
-        wxs.addServlet( "/SimpleServlet", SimpleGetServlet.class );
+        wxs.addServlet( "/Example/SimpleServlet", SimpleGetServlet.class );
         wxs.requireFormAuthentication( "Sample Realm", "/Logon", "/Error" );
-        wxs.addSecureURL( "SecureArea1", "/SimpleServlet" );
+        wxs.addSecureURL( "SecureArea1", "/Example/SimpleServlet" );
         wxs.addAuthorizedRole( "SecureArea1", "supervisor" );
 
         ServletRunner sr = new ServletRunner( toInputStream( wxs.asText() ) );
         ServletUnitClient wc = sr.newClient();
-        WebResponse response = wc.getResponse( "http://localhost/SimpleServlet" );
+        WebResponse response = wc.getResponse( "http://localhost/Example/SimpleServlet" );
         WebForm form = response.getFormWithID( "login" );
         assertNotNull( "did not find login form", form );
 
@@ -196,7 +196,7 @@
         assertEquals( "content type", "text/html", response.getContentType() );
         assertEquals( "requested resource", SimpleGetServlet.RESPONSE_TEXT, response.getText() );
 
-        InvocationContext ic = wc.newInvocation( "http://localhost/SimpleServlet" );
+        InvocationContext ic = wc.newInvocation( "http://localhost/Example/SimpleServlet" );
         assertEquals( "Authenticated user", "Me", ic.getRequest().getRemoteUser() );
         assertTrue( "User assigned to 'bogus' role", !ic.getRequest().isUserInRole( "bogus" ) );
         assertTrue( "User not assigned to 'supervisor' role", ic.getRequest().isUserInRole( "supervisor" ) );