[MO-java-dev] CVS: mockobjects-java/src/extensions/com/mockobjects/apache/commons/httpclient MockHeadMethod.java,NONE,1.1 MockHttpClient.java,1.1,1.2 MockHttpMethod.java,1.3,1.4 MockMethodHelper.java,1.2,1.3 MockPutMethod.java,1.1,1.2

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

Update of /cvsroot/mockobjects/mockobjects-java/src/extensions/com/mockobjects/apache/commons/httpclient
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24538/src/extensions/com/mockobjects/apache/commons/httpclient

Modified Files:
	MockHttpClient.java MockHttpMethod.java MockMethodHelper.java 
	MockPutMethod.java 
Added Files:
	MockHeadMethod.java 
Log Message:
Did some stuff


--- NEW FILE: MockHeadMethod.java ---
package com.mockobjects.apache.commons.httpclient;

import com.mockobjects.*;
import com.mockobjects.util.AssertMo;
import com.mockobjects.util.Verifier;
import org.apache.commons.httpclient.*;
import org.apache.commons.httpclient.methods.HeadMethod;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;

public class MockHeadMethod extends HeadMethod implements Verifiable {
    private ExpectationValue myFollowRedirects; // lazy initialise because of super constructor
    private ExpectationSet myPairs = new ExpectationSet("pairs");
    private ReturnObjectList myStatusCodes = new ReturnObjectList("status code");
    private String myResponseBody;
    private String myStatusText;
    private final MockMethodHelper helper = new MockMethodHelper();

    public void setExpectedPath(String aPath) {
        helper.setExpectedPath(aPath);
    }

    public void setPath(String aPath) {
        helper.setPath(aPath);
    }

    public String getPath() {
        return helper.getPath();
    }

    public void setStrictMode(boolean b) {
        helper.setStrictMode(b);
    }

    public boolean isStrictMode() {
        return helper.isStrictMode();
    }

    public void setRequestHeader(String s, String s1) {
        helper.setRequestHeader(s, s1);
    }

    public void setUseDisk(boolean b) {
        notImplemented();
    }

    private void notImplemented() {
        AssertMo.notImplemented(getClass().getName());
    }

    public void setRequestHeader(Header header) {
        helper.setRequestHeader(header);
    }

    public boolean getUseDisk() {
        notImplemented();
        return false;
    }

    public void addRequestHeader(String s, String s1) {
        helper.addRequestHeader(s, s1);
    }

    public void setTempDir(String s) {
        notImplemented();
    }

    public void addRequestHeader(Header header) {
        helper.addRequestHeader(header);
    }

    public String getTempDir() {
        notImplemented();
        return null;
    }

    public Header getRequestHeader(String s) {
        return helper.getRequestHeader(s);
    }

    public void setTempFile(String s) {
        notImplemented();
    }

    public void removeRequestHeader(String s) {
        helper.removeRequestHeader(s);
    }

    public String getTempFile() {
        notImplemented();
        return null;
    }

    public boolean getFollowRedirects() {
        return helper.getFollowRedirects();
    }

    public File getFileData() {
        notImplemented();
        return null;
    }

    public void setExpectedFollowRedirects(boolean aFollowRedirects) {
        if (myFollowRedirects == null) {
            myFollowRedirects = new ExpectationValue("follow redirects");
        }
        myFollowRedirects.setExpected(aFollowRedirects);
    }

    public void setFollowRedirects(boolean aFollowRedirects) {
        if (myFollowRedirects == null) {
            myFollowRedirects = new ExpectationValue("follow redirects");
        }
        myFollowRedirects.setActual(aFollowRedirects);
    }

    public void setFileData(File file) {
        notImplemented();
    }

    public void setQueryString(String s) {
        helper.setQueryString(s);
    }

    public String getName() {
        notImplemented();
        return null;
    }

    public void addExpectedQueryString(NameValuePair aPair) {
        myPairs.addExpected(new MapEntry(aPair.getName(), aPair.getValue()));
    }

    public void setQueryString(NameValuePair[] aPairs) {
        for (int i = 0; i < aPairs.length; i++) {
            myPairs.addActual(new MapEntry(
                aPairs[i].getName(), aPairs[i].getValue()));
        }
    }

    public void recycle() {
        AssertMo.notImplemented(getClass().getName());
    }

    public String getQueryString() {
        AssertMo.notImplemented(getClass().getName());
        return null;
    }

    public byte[] getResponseBody() {
        AssertMo.notImplemented(getClass().getName());
        return new byte[]{};
    }

    public Header[] getRequestHeaders() {
        AssertMo.notImplemented(getClass().getName());
        return null;
    }

    public void setupGetResponseBodyAsString(String aResponseBody) {
        myResponseBody = aResponseBody;
    }

    public String getResponseBodyAsString() {
        return myResponseBody;
    }

    public boolean validate() {
        AssertMo.notImplemented(getClass().getName());
        return false;
    }

    public InputStream getResponseBodyAsStream() throws IOException {
        AssertMo.notImplemented(getClass().getName());
        return null;
    }

    public void addGetStatusCode(int aStatusCode) {
        myStatusCodes.addObjectToReturn(new Integer(aStatusCode));
    }

    public int getStatusCode() {
        return ((Integer) myStatusCodes.nextReturnObject()).intValue();
    }

    public void setupGetStatusText(String aStatusText) {
        myStatusText = aStatusText;
    }

    public String getStatusText() {
        return myStatusText;
    }

    public Header[] getResponseHeaders() {
        AssertMo.notImplemented(getClass().getName());
        return new Header[]{};
    }

    public Header getResponseHeader(String key) {
        return helper.getResponseHeader(key);
    }

    public void addGetResponseHeader(String key, Header header) {
        helper.addGetResponseHeader(key, header);
    }

    public boolean hasBeenUsed() {
        AssertMo.notImplemented(getClass().getName());
        return false;
    }

    public int execute(HttpState state, HttpConnection connection)
        throws HttpException, IOException {
        AssertMo.notImplemented(getClass().getName());
        return 0;
    }

    public boolean isHttp11() {
        AssertMo.notImplemented(getClass().getName());
        return false;
    }

    public void setHttp11(boolean b) {
        AssertMo.notImplemented(getClass().getName());
    }

    public void verify() {
        Verifier.verifyObject(this);
    }

}

Index: MockHttpClient.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/extensions/com/mockobjects/apache/commons/httpclient/MockHttpClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockHttpClient.java	9 May 2002 13:16:38 -0000	1.1
+++ MockHttpClient.java	22 Nov 2004 14:45:57 -0000	1.2
@@ -9,13 +9,12 @@
 
 public class MockHttpClient extends HttpClient implements Verifiable{
 
-    private final ExpectationValue method = new ExpectationValue("method");
+    private final ReturnObjectBag method = new ReturnObjectBag("method");
     private final ExpectationValue body = new ExpectationValue("body");
-    private int statusCode;
     private ExpectationValue httpState = new ExpectationValue("httpState");
 
-    public void setExpectedMethod(HttpMethod method){
-        this.method.setExpected(method);
+    public void addExpectedMethod(HttpMethod method, int statusCode){
+        this.method.putObjectToReturn(method, statusCode);
     }
 
     public void setExpectedBody(String body){
@@ -23,12 +22,7 @@
     }
 
     public int executeMethod(HttpMethod method){
-        this.method.setActual(method);
-        return statusCode;
-    }
-
-    public void setupStatusCode(int statusCode){
-        this.statusCode = statusCode;
+        return this.method.getNextReturnInt(method);
     }
 
     public void setState(HttpState httpState){

Index: MockHttpMethod.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/extensions/com/mockobjects/apache/commons/httpclient/MockHttpMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockHttpMethod.java	14 May 2003 15:07:35 -0000	1.3
+++ MockHttpMethod.java	22 Nov 2004 14:45:57 -0000	1.4
@@ -7,9 +7,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-public class MockHttpMethod extends MockMethodHelper implements HttpMethod {
-
-
+public abstract class MockHttpMethod extends MockMethodHelper
+    implements HttpMethod {
 
     public String getName() {
         notImplemented();

Index: MockMethodHelper.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/extensions/com/mockobjects/apache/commons/httpclient/MockMethodHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MockMethodHelper.java	11 Aug 2003 09:52:53 -0000	1.2
+++ MockMethodHelper.java	22 Nov 2004 14:45:57 -0000	1.3
@@ -156,7 +156,7 @@
         notImplemented();
     }
 
-    protected void readResponse(HttpState httpState, HttpConnection httpConnection) throws IOException, HttpException {
+    protected void readResponse(HttpState httpState, HttpConnection httpConnection) throws HttpException {
         notImplemented();
     }
 

Index: MockPutMethod.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/extensions/com/mockobjects/apache/commons/httpclient/MockPutMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockPutMethod.java	11 Aug 2003 09:52:53 -0000	1.1
+++ MockPutMethod.java	22 Nov 2004 14:45:57 -0000	1.2
@@ -124,7 +124,7 @@
         requestBody.setExpected(body);
     }
 
-    public void setRequestBody(InputStream inputStream) throws IOException {
+    public void setRequestBody(InputStream inputStream) {
         notImplemented();
     }
 
@@ -251,7 +251,7 @@
         helper.addContentLengthRequestHeader(httpState, httpConnection);
     }
 
-    protected void readResponse(HttpState httpState, HttpConnection httpConnection) throws IOException, HttpException {
+    protected void readResponse(HttpState httpState, HttpConnection httpConnection) throws HttpException {
         helper.readResponse(httpState, httpConnection);
     }