From: Jeff M. <cus...@us...> - 2003-01-23 11:43:03
|
Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/com/mockobjects/servlet In directory sc8-pr-cvs1:/tmp/cvs-serv20683/src/j2ee/1.3/com/mockobjects/servlet Modified Files: MockHttpServletRequest.java Log Message: Added support for ServletPath Index: MockHttpServletRequest.java =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/com/mockobjects/servlet/MockHttpServletRequest.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- MockHttpServletRequest.java 31 Dec 2002 13:43:01 -0000 1.11 +++ MockHttpServletRequest.java 23 Jan 2003 11:43:00 -0000 1.12 @@ -27,7 +27,7 @@ private String myContextPath; private String myPathInfo; private String myRemoteAddress; - private String myRequestURI; + private final ReturnValue myRequestURI = new ReturnValue("request URI"); private final ReturnValue method = new ReturnValue("method"); private final ReturnValue protocol = new ReturnValue("protocol"); private ServletInputStream myInputStream; @@ -42,7 +42,7 @@ private ReturnObjectList myAttributesToReturn = new ReturnObjectList("attributes"); private ExpectationValue myContentType = new ExpectationValue("content type"); private ExpectationList myGetAttributeNames = new ExpectationList("get attribute names"); - + private final ReturnValue servletPath = new ReturnValue("servlet path"); public void setupGetAttribute(Object anAttributeToReturn) { myAttributesToReturn.addObjectToReturn(anAttributeToReturn); @@ -51,7 +51,7 @@ public void addExpectedGetAttributeName(String anAttributeName) { myGetAttributeNames.addExpected(anAttributeName); } - + public Object getAttribute(String anAttributeName) { myGetAttributeNames.addActual(anAttributeName); return myAttributesToReturn.nextReturnObject(); @@ -60,7 +60,7 @@ public void setupGetAttrubuteNames(Vector attributeNames){ myAttributesNames = attributeNames; } - + public Enumeration getAttributeNames() { return myAttributesNames.elements(); } @@ -234,11 +234,11 @@ } public void setupGetRequestURI(String aRequestURI) { - myRequestURI = aRequestURI; + myRequestURI.setValue(aRequestURI); } public String getRequestURI() { - return myRequestURI; + return (String)myRequestURI.getValue(); } public String getScheme() { @@ -253,9 +253,12 @@ return 0; } + public void setupGetServletPath(String path){ + this.servletPath.setValue(path); + } + public String getServletPath() { - notImplemented(); - return null; + return (String)servletPath.getValue(); } public HttpSession getSession() { |