[MO-java-dev] CVS: mockobjects-java/src/j2ee/1.3/com/mockobjects/servlet MockHttpServletRequest.java,1.4,1.5

[Jeff M. <cus...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/com/mockobjects/servlet
In directory usw-pr-cvs1:/tmp/cvs-serv23538/src/j2ee/1.3/com/mockobjects/servlet

Modified Files:
	MockHttpServletRequest.java 
Log Message:
Changed to use ReturnObjectList


Index: MockHttpServletRequest.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/j2ee/1.3/com/mockobjects/servlet/MockHttpServletRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MockHttpServletRequest.java	22 Apr 2002 16:53:13 -0000	1.4
+++ MockHttpServletRequest.java	30 Apr 2002 11:51:50 -0000	1.5
@@ -1,44 +1,52 @@
 package com.mockobjects.servlet;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
+import com.mockobjects.ExpectationSet;
+import com.mockobjects.MapEntry;
+import com.mockobjects.MockObject;
+import com.mockobjects.ReturnObjectList;
+
+import javax.servlet.ServletInputStream;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.Cookie;
 import java.util.*;
-import java.io.*;
-import java.net.*;
-import com.mockobjects.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.security.Principal;
 
 /**
  * @version $Revision$
  */
 public class MockHttpServletRequest extends MockObject
-implements HttpServletRequest {
+    implements HttpServletRequest {
     private Dictionary myParameters = new Hashtable();
     private Dictionary myHeaders = new Hashtable();
-    private HttpSession httpSession;
-    private String contentType;
+    private HttpSession myHttpSession;
+    private String myContentType;
     private String myPathInfo;
-    private String remoteAddress;
+    private String myRemoteAddress;
     private String myRequestURI;
     private String myMethod;
     private ServletInputStream myInputStream;
-    private java.security.Principal userPrincipal;
+    private java.security.Principal myUserPrincipal;
     private ExpectationSet mySetAttributes =
-        new ExpectationSet(MockHttpServletRequest.class.getName() + 
-            ".setAttribute");
+        new ExpectationSet(MockHttpServletRequest.class.getName() +
+        ".setAttribute");
     private ExpectationSet myRemoveAttributes = new ExpectationSet(
         MockHttpServletRequest.class.getName() + ".removeAttribute");
-    private List myAttributesToReturn = new ArrayList();
+    private ReturnObjectList myAttributesToReturn
+        = new ReturnObjectList("attributes");
 
-    public void setupGetAttribute(Object anAttributeToReturn){
-        myAttributesToReturn.add(anAttributeToReturn);
+    public void setupGetAttribute(Object anAttributeToReturn) {
+        myAttributesToReturn.addObjectToReturn(anAttributeToReturn);
     }
 
     public Object getAttribute(String anAttributeName) {
-        return myAttributesToReturn.remove(0);
+        return myAttributesToReturn.nextReturnObject();
     }
 
-    public java.util.Enumeration getAttributeNames() {
+    public Enumeration getAttributeNames() {
         notImplemented();
         return null;
     }
@@ -63,15 +71,15 @@
     }
 
     public void setContentType(String contentType) {
-        this.contentType = contentType;
+        this.myContentType = contentType;
     }
 
-    public java.lang.String getContextPath() {
+    public String getContextPath() {
         notImplemented();
         return null;
     }
 
-    public javax.servlet.http.Cookie[] getCookies() {
+    public Cookie[] getCookies() {
         notImplemented();
         return null;
     }
@@ -81,24 +89,24 @@
     }
 
     public String getHeader(String arg1) {
-        return (String)myHeaders.get(arg1);
+        return (String) myHeaders.get(arg1);
     }
 
-    public java.util.Enumeration getHeaderNames() {
+    public Enumeration getHeaderNames() {
         notImplemented();
         return null;
     }
 
-    public java.util.Enumeration getHeaders(java.lang.String arg1) {
+    public Enumeration getHeaders(java.lang.String arg1) {
         notImplemented();
         return null;
     }
 
-    public void setupGetInputStream(ServletInputStream anInputStream){
+    public void setupGetInputStream(ServletInputStream anInputStream) {
         this.myInputStream = anInputStream;
     }
 
-    public javax.servlet.ServletInputStream getInputStream()
+    public ServletInputStream getInputStream()
         throws java.io.IOException {
         return myInputStream;
     }
@@ -107,17 +115,17 @@
         return 0;
     }
 
-    public java.util.Locale getLocale() {
+    public Locale getLocale() {
         notImplemented();
         return null;
     }
 
-    public java.util.Enumeration getLocales() {
+    public Enumeration getLocales() {
         notImplemented();
         return null;
     }
 
-    public void setupGetMethod(String aMethod){
+    public void setupGetMethod(String aMethod) {
         this.myMethod = aMethod;
     }
 
@@ -127,13 +135,13 @@
 
     public String getParameter(String paramName) {
         String[] values = getParameterValues(paramName);
-        if (values == null)
+        if(values == null)
             return null;
 
         return values[0];
     }
 
-    public java.util.Enumeration getParameterNames() {
+    public Enumeration getParameterNames() {
         return myParameters.keys();
     }
 
@@ -160,7 +168,7 @@
         return null;
     }
 
-    public java.io.BufferedReader getReader() throws java.io.IOException {
+    public BufferedReader getReader() throws IOException {
         notImplemented();
         return null;
     }
@@ -170,12 +178,12 @@
         return null;
     }
 
-    public void setupGetRemoteAddr(String remoteAddress){
-        this.remoteAddress = remoteAddress;
+    public void setupGetRemoteAddr(String remoteAddress) {
+        this.myRemoteAddress = remoteAddress;
     }
 
     public String getRemoteAddr() {
-        return remoteAddress;
+        return myRemoteAddress;
     }
 
     public String getRemoteHost() {
@@ -188,7 +196,7 @@
         return null;
     }
 
-    public javax.servlet.RequestDispatcher getRequestDispatcher(
+    public RequestDispatcher getRequestDispatcher(
         java.lang.String arg1) {
         notImplemented();
         return null;
@@ -199,7 +207,7 @@
         return null;
     }
 
-    public void setupGetRequestURI(String aRequestURI){
+    public void setupGetRequestURI(String aRequestURI) {
         myRequestURI = aRequestURI;
     }
 
@@ -227,11 +235,11 @@
     }
 
     public HttpSession getSession() {
-        return httpSession;
+        return myHttpSession;
     }
 
     public void setSession(HttpSession httpSession) {
-        this.httpSession = httpSession;
+        this.myHttpSession = httpSession;
     }
 
     public HttpSession getSession(boolean arg1) {
@@ -239,12 +247,12 @@
         return null;
     }
 
-    public void setupGetUserPrincipal(java.security.Principal userPrincipal){
-        this.userPrincipal = userPrincipal;
+    public void setupGetUserPrincipal(Principal userPrincipal) {
+        this.myUserPrincipal = userPrincipal;
     }
 
-    public java.security.Principal getUserPrincipal() {
-        return userPrincipal;
+    public Principal getUserPrincipal() {
+        return myUserPrincipal;
     }
 
     public boolean isRequestedSessionIdFromCookie() {
@@ -271,7 +279,7 @@
         return false;
     }
 
-    public void setupRemoveAttribute(String anAttributeToRemove){
+    public void setupRemoveAttribute(String anAttributeToRemove) {
         myRemoveAttributes.addExpected(anAttributeToRemove);
     }
 
@@ -299,7 +307,7 @@
     }
 
     public void setupAddParameter(String paramName, String value) {
-        setupAddParameter(paramName, new String[] { value });
+        setupAddParameter(paramName, new String[]{value});
     }
 
     public void setupNoParameters() {
@@ -318,15 +326,14 @@
         myPathInfo = pathInfo;
     }
 
-    public StringBuffer getRequestURL(){
+    public StringBuffer getRequestURL() {
         return null;
     }
 
-    public void setCharacterEncoding(String s){
+    public void setCharacterEncoding(String s) {
     }
 
-    public Map getParameterMap(){
+    public Map getParameterMap() {
         return null;
     }
-}
-
+}
\ No newline at end of file