[Mocklib-checkins] mocklib2/input/javasrc/biz/xsoftware/mock MethodBehavior.java, NONE, 1.1 Behavior.java, 1.2, 1.3 MockObject.java, 1.6, 1.7 MockSuperclass.java, 1.13, 1.14 MockObjectImpl.java, 1.11, 1.12

[Nobody <fas...@us...>]

Update of /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30736/input/javasrc/biz/xsoftware/mock

Modified Files:
	Behavior.java MockObject.java MockSuperclass.java 
	MockObjectImpl.java 
Added Files:
	MethodBehavior.java 
Log Message:
starting addition of newbehavior.

Index: Behavior.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock/Behavior.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Behavior.java	7 Aug 2006 15:52:45 -0000	1.2
--- Behavior.java	10 Sep 2006 17:18:39 -0000	1.3
***************
*** 5,18 ****
  
  /**
!  * An implementation of this class must have the 
   */
! public interface Behavior
  {
      public Object[] clone(Object[] params);
      
      /**
!      * This method will be called in place of the interface method you are expecting to be called.
!      * This is where you can add behavior to the mock object.
       * 
       * @param params
       */
--- 5,26 ----
  
  /**
!  * Use MethodBehavior interface instead of Behavior interface
!  * @deprecated
   */
! public interface Behavior extends MethodBehavior
  {
+ 	/**
+ 	 * Use MethodBehavior interface instead of Behavior interface
+ 	 * 
+ 	 * @deprecated
+ 	 * @param params
+ 	 * @return
+ 	 */
      public Object[] clone(Object[] params);
      
      /**
!      * Use MethodBehavior interface instead of Behavior interface
       * 
+      * @deprecated
       * @param params
       */

Index: MockSuperclass.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock/MockSuperclass.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MockSuperclass.java	25 Aug 2006 22:31:55 -0000	1.13
--- MockSuperclass.java	10 Sep 2006 17:18:39 -0000	1.14
***************
*** 244,247 ****
--- 244,249 ----
          if(retVal instanceof Behavior) {
              return ((Behavior)retVal).runMethod(params);
+         } else if(retVal instanceof MethodBehavior) {
+         	throw new UnsupportedOperationException("Not supported yet, use Behavior instead of MethodBehavior");
          } else if(retVal instanceof Throwable) {
              Throwable t = (Throwable)retVal;
***************
*** 675,679 ****
      }
  
!     public void addBehavior(String method, Behavior behavior) {
          if(method == null)
              throw new IllegalArgumentException("method parameter cannot be null");
--- 677,681 ----
      }
  
!     public void addBehavior(String method, MethodBehavior behavior) {
          if(method == null)
              throw new IllegalArgumentException("method parameter cannot be null");

Index: MockObject.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock/MockObject.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MockObject.java	25 Aug 2006 19:42:09 -0000	1.6
--- MockObject.java	10 Sep 2006 17:18:39 -0000	1.7
***************
*** 172,176 ****
  	public int getExpectTimeout();
  
!     public void addBehavior(String string, Behavior behavior);
  
  }
--- 172,176 ----
  	public int getExpectTimeout();
  
!     public void addBehavior(String string, MethodBehavior behavior);
  
  }

Index: MockObjectImpl.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock/MockObjectImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MockObjectImpl.java	1 Sep 2006 17:07:24 -0000	1.11
--- MockObjectImpl.java	10 Sep 2006 17:18:39 -0000	1.12
***************
*** 26,31 ****
  	private Class[] classes;
  	
-       Class<?>[] primitiveTypes = {Integer.TYPE, Double.TYPE, Float.TYPE, Boolean.TYPE,
-                                    Character.TYPE, Byte.TYPE, Short.TYPE, Long.TYPE};
  	static {
  		//reflect and find all the methods of the superclass.
--- 26,29 ----
***************
*** 87,91 ****
                  if(!primitiveClass.isInstance(o))
                      throw new IllegalArgumentException("You specified an incorrect return type on method\n="+methodString+"\n"
!                                                        +"You specified a return type of="+o.getClass()+" which needs to be or extend type="+returnType);
              } else if(!returnType.isInstance(o)) //if not a primitive, make sure is assignable....
                  throw new IllegalArgumentException("You specified an incorrect return type on method\n="+methodString+"\n"
--- 85,90 ----
                  if(!primitiveClass.isInstance(o))
                      throw new IllegalArgumentException("You specified an incorrect return type on method\n="+methodString+"\n"
!                                                        +"You specified a return type of="+o.getClass()
!                                                        +" which needs to be or extend type="+returnType);
              } else if(!returnType.isInstance(o)) //if not a primitive, make sure is assignable....
                  throw new IllegalArgumentException("You specified an incorrect return type on method\n="+methodString+"\n"

--- NEW FILE: MethodBehavior.java ---
package biz.xsoftware.mock;

public interface MethodBehavior {

}