[Mocklib-checkins] mocklib2/input/javasrc/biz/xsoftware/mock2 Messages.java,1.5,1.6 MockObject.java,1.5,1.6

[Christopher B. W. <da...@us...>]

Update of /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23471/input/javasrc/biz/xsoftware/mock2

Modified Files:
	Messages.java MockObject.java 
Log Message:
Fixed some bugs with method not being ignored correctly. general cleanup

Index: MockObject.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock2/MockObject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MockObject.java	20 Mar 2006 15:01:20 -0000	1.5
--- MockObject.java	2 May 2006 23:26:34 -0000	1.6
***************
*** 156,160 ****
  	 *            the optional parameter types of the method call
  	 */
! 	public void addIgnoreMethod(String methodName, Class... vargs);
  
  	/**
--- 156,172 ----
  	 *            the optional parameter types of the method call
  	 */
! 	public void addIgnoredMethod(String methodName, Class... vargs);
! 
!     /**
!      * Add a method to the ignore list.
!      * 
!      * @param returnValue
!      *            the default value to return from the method call
!      * @param methodName
!      *            the name of the method to ignore
!      * @param vargs
!      *            the optional parameter types of the method call
!      */
!     public void addIgnoredMethod(Object returnValue, String methodName, Class... vargs);
  
  	/**
***************
*** 166,170 ****
  	 *            the optinal parameter types of the method call
  	 */
! 	public void removeIgnoreMethod(String methodName, Class... vargs);
  
  	/**
--- 178,182 ----
  	 *            the optinal parameter types of the method call
  	 */
! 	public void removeIgnoredMethod(String methodName, Class... vargs);
  
  	/**

Index: Messages.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock2/Messages.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Messages.java	6 Apr 2006 15:25:09 -0000	1.5
--- Messages.java	2 May 2006 23:26:34 -0000	1.6
***************
*** 9,15 ****
  		"MockObject.verify() must be called before accessing and of the methods on CalledMethod object";
  	public static final String METHOD_CAN_NOT_ACCESS="Mocklib can not retrive the method you defined in your "+
! 	"Behavior Implementation class, Please make sure the method is accessable";
! 	public static final String TOO_MANY_METHODS_CALLED="too many methods called while less method expected";
  	public static final String ORDER_EXCEPTION="methods called or methods expected is in wrong order";
- 	
  }
--- 9,14 ----
  		"MockObject.verify() must be called before accessing and of the methods on CalledMethod object";
  	public static final String METHOD_CAN_NOT_ACCESS="Mocklib can not retrive the method you defined in your "+
! 	    "Behavior Implementation class, Please make sure the method is accessable";
! 	public static final String TOO_MANY_METHODS_CALLED="Unexpected method called";
  	public static final String ORDER_EXCEPTION="methods called or methods expected is in wrong order";
  }