mockobjects-java-dev

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

Update of /cvsroot/mockobjects/mockobjects-java/src/extensions/com/mockobjects/apache/commons/httpclient
In directory usw-pr-cvs1:/tmp/cvs-serv12913/src/extensions/com/mockobjects/apache/commons/httpclient

Modified Files:
	MockGetMethod.java MockHttpMethod.java 
Log Message:
Lots of small changes to mocks


Index: MockGetMethod.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/extensions/com/mockobjects/apache/commons/httpclient/MockGetMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockGetMethod.java	9 May 2002 13:16:38 -0000	1.1
+++ MockGetMethod.java	19 Jun 2002 15:26:16 -0000	1.2
@@ -10,18 +10,16 @@
 
 import com.mockobjects.util.AssertMo;
 import com.mockobjects.util.Verifier;
-import com.mockobjects.ExpectationValue;
-import com.mockobjects.Verifiable;
-import com.mockobjects.ExpectationSet;
-import com.mockobjects.MapEntry;
+import com.mockobjects.*;
 
 public class MockGetMethod extends GetMethod implements Verifiable{
 
     private ExpectationValue myFollowRedirects; // lazy initialise because of super constructor
     private ExpectationValue myPath = new ExpectationValue("path");
     private ExpectationSet myPairs = new ExpectationSet("pairs");
-    private int myStatusCode;
+    private ReturnObjectList myStatusCodes = new ReturnObjectList("status code");
     private String myResponseBody;
+    private String myStatusText;
 
     public void setExpectedPath(String aPath){
         myPath.setExpected(aPath);
@@ -182,17 +180,20 @@
         return null;
     }
 
-    public void setupGetStatusCode(int aStatusCode){
-        myStatusCode = aStatusCode;
+    public void addGetStatusCode(int aStatusCode){
+        myStatusCodes.addObjectToReturn(new Integer(aStatusCode));
     }
 
     public int getStatusCode() {
-        return myStatusCode;
+        return ((Integer)myStatusCodes.nextReturnObject()).intValue();
+    }
+
+    public void setupGetStatusText(String aStatusText){
+        myStatusText = aStatusText;
     }
 
     public String getStatusText() {
-        AssertMo.notImplemented(getClass().getName());
-        return null;
+        return myStatusText;
     }
 
     public Header[] getResponseHeaders() {

Index: MockHttpMethod.java
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/src/extensions/com/mockobjects/apache/commons/httpclient/MockHttpMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MockHttpMethod.java	9 May 2002 13:16:38 -0000	1.1
+++ MockHttpMethod.java	19 Jun 2002 15:26:16 -0000	1.2
@@ -1,136 +1,141 @@
 package com.mockobjects.apache.commons.httpclient;
 
-import com.mockobjects.*;
-import org.apache.commons.httpclient.HttpMethod;
+import com.mockobjects.MockObject;
+import org.apache.commons.httpclient.*;
+
+import java.io.InputStream;
+import java.io.IOException;
 
 public class MockHttpMethod extends MockObject implements HttpMethod {
-    public String getName(){
+
+    public String getName() {
         notImplemented();
         return null;
     }
 
-    public void setPath(String path){
+    public void setPath(String path) {
         notImplemented();
     }
 
-    public String getPath(){
+    public String getPath() {
         notImplemented();
         return null;
     }
 
-    public void setStrictMode(boolean strictMode){
+    public void setStrictMode(boolean strictMode) {
         notImplemented();
     }
 
-    public boolean isStrictMode(){
+    public boolean isStrictMode() {
         notImplemented();
         return false;
     }
 
-    public void setRequestHeader(String name, String value){
+    public void setRequestHeader(String name, String value) {
         notImplemented();
     }
 
-    public void setRequestHeader(org.apache.commons.httpclient.Header header){
+    public void setRequestHeader(Header header) {
         notImplemented();
     }
 
-    public void addRequestHeader(String name, String value){
+    public void addRequestHeader(String name, String value) {
         notImplemented();
     }
 
-    public void addRequestHeader(org.apache.commons.httpclient.Header header){
+    public void addRequestHeader(Header header) {
         notImplemented();
     }
 
-    public org.apache.commons.httpclient.Header getRequestHeader(String name){
+    public Header getRequestHeader(String name) {
         notImplemented();
         return null;
     }
 
-    public void removeRequestHeader(String name){
+    public void removeRequestHeader(String name) {
         notImplemented();
     }
 
-    public boolean getFollowRedirects(){
+    public boolean getFollowRedirects() {
         notImplemented();
         return false;
     }
 
-    public void setFollowRedirects(boolean followRedirects){
+    public void setFollowRedirects(boolean followRedirects) {
         notImplemented();
     }
 
-    public void setQueryString(String queryString){
+    public void setQueryString(String queryString) {
         notImplemented();
     }
 
-    public void setQueryString(org.apache.commons.httpclient.NameValuePair[]
-    nameValuePair){
+    public void setQueryString(NameValuePair[]
+        nameValuePair) {
         notImplemented();
     }
 
-    public String getQueryString(){
+    public String getQueryString() {
         notImplemented();
         return null;
     }
 
-    public org.apache.commons.httpclient.Header getRequestHeaders()[]{
+    public Header getRequestHeaders()[] {
         notImplemented();
         return null;
     }
 
-    public boolean validate(){
+    public boolean validate() {
         notImplemented();
         return false;
     }
 
-    public int getStatusCode(){
+    public int getStatusCode() {
         notImplemented();
         return -1;
     }
 
-    public String getStatusText(){
+    public String getStatusText() {
         notImplemented();
         return null;
     }
 
-    public org.apache.commons.httpclient.Header getResponseHeaders()[]{
+    public Header getResponseHeaders()[] {
         notImplemented();
         return null;
     }
 
-    public org.apache.commons.httpclient.Header getResponseHeader(String name){
+    public Header getResponseHeader(String name) {
         notImplemented();
         return null;
     }
 
-    public byte getResponseBody()[]{
+    public byte getResponseBody()[] {
         notImplemented();
         return null;
     }
 
-    public String getResponseBodyAsString(){
+    public String getResponseBodyAsString() {
         notImplemented();
         return null;
     }
 
-    public java.io.InputStream getResponseBodyAsStream() throws java.io.IOException{
+    public InputStream getResponseBodyAsStream() throws IOException {
         notImplemented();
         return null;
     }
 
-    public boolean hasBeenUsed(){
+    public boolean hasBeenUsed() {
         notImplemented();
         return false;
     }
 
-    public int execute(org.apache.commons.httpclient.HttpState state, org.apache.commons.httpclient.HttpConnection connection) throws org.apache.commons.httpclient.HttpException, java.io.IOException{
+    public int execute(HttpState state, HttpConnection connection)
+        throws HttpException, IOException {
         notImplemented();
         return -1;
     }
 
-    public void recycle(){
+    public void recycle() {
         notImplemented();
     }
 }