[Mocklib-checkins] mocklib2/input/javasrc/biz/xsoftware/mock2/impl MockObjectImpl.java,1.1,1.1.2.1 CalledMethodImpl.java,1.1,1.1.2.1 MockObjectSuperImpl.java,1.3,1.3.2.1

[Jay <ja...@us...>]

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

Modified Files:
      Tag: branchForOffice
	MockObjectImpl.java CalledMethodImpl.java 
	MockObjectSuperImpl.java 
Log Message:
check in  to implements at office :)

Index: CalledMethodImpl.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock2/impl/CalledMethodImpl.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** CalledMethodImpl.java	3 Jan 2006 13:29:54 -0000	1.1
--- CalledMethodImpl.java	13 Jan 2006 16:33:54 -0000	1.1.2.1
***************
*** 36,38 ****
--- 36,40 ----
  	
  
+ 	
+ 
  }

Index: MockObjectImpl.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock2/impl/MockObjectImpl.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** MockObjectImpl.java	13 Jan 2006 14:48:31 -0000	1.1
--- MockObjectImpl.java	13 Jan 2006 16:33:54 -0000	1.1.2.1
***************
*** 3,13 ****
  import java.lang.reflect.InvocationHandler;
  import java.lang.reflect.Method;
  
  
  public class MockObjectImpl extends MockObjectSuperImpl implements
  		InvocationHandler {
! 
  	public MockObjectImpl(Class[] interfacesToMock) {
! 		// TODO Auto-generated constructor stub
  	}
  
--- 3,39 ----
  import java.lang.reflect.InvocationHandler;
  import java.lang.reflect.Method;
+ import java.util.HashSet;
+ import java.util.Set;
  
+ import biz.xsoftware.mock2.CalledMethod;
+ import biz.xsoftware.mock2.MockObject;
+ import biz.xsoftware.mock2.impl.MockObjectSuperImpl;
  
+ /**
+  * this class implements the interface InvocationHandler,defind a 
+  * certain MockObject and return a calledMethod instance to the 
+  * test cases 
+  * @author Jay
+  *
+  */
  public class MockObjectImpl extends MockObjectSuperImpl implements
  		InvocationHandler {
! 	private static Set<Method> isMethodInSuper=new HashSet<Method>();
! 	Class[]classes;
! 	
! 	static {
! 		Class c=MockObject.class;
! 		Method[] m=c.getMethods();
! 		for(int i=0;i<m.length;i++){
! 			isMethodInSuper.add(m[i]);
! 		}
! 		c=Object.class;
! 		m=c.getMethods();
! 		for(int i=0;i<m.length;i++){
! 			isMethodInSuper.add(m[i]);
! 		}
! 	}
  	public MockObjectImpl(Class[] interfacesToMock) {
! 		this.classes=interfacesToMock;
  	}
  
***************
*** 19,24 ****
--- 45,78 ----
  			throws Throwable {
  		// TODO Auto-generated method stub
+ 		if(isMethodInSuper.contains(method)){
+ 			return callSuperMethod(proxy,method,args);
+ 		}
+ 		return null;
+ 	}
+ 
+ 	private Object callSuperMethod(Object proxy, Method method, Object[] args) {
+ 		// TODO Auto-generated method stub
+ 		return null;
+ 	}
+ 	
+ 	public Class[] getClasses(){
+ 		return this.classes;
+ 	}
+ 
+ 	public CalledMethod expect(String methodName, Class... vargs) {
+ 		// TODO Auto-generated method stub
+ 		return null;
+ 	}
+ 
+ 	public CalledMethod expect(Object returnValue, String methodName, Class... vargs) {
+ 		// TODO Auto-generated method stub
+ 		return null;
+ 	}
+ 
+ 	public CalledMethod expect(String methodName, long timeout, Class... vargs) {
+ 		// TODO Auto-generated method stub
  		return null;
  	}
  
  }
+ 

Index: MockObjectSuperImpl.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock2/impl/MockObjectSuperImpl.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** MockObjectSuperImpl.java	13 Jan 2006 14:48:31 -0000	1.3
--- MockObjectSuperImpl.java	13 Jan 2006 16:33:54 -0000	1.3.2.1
***************
*** 1,4 ****
--- 1,6 ----
  package biz.xsoftware.mock2.impl;
  
+ import java.util.logging.Logger;
+ 
  import biz.xsoftware.mock2.Behavior;
  import biz.xsoftware.mock2.CalledMethod;
***************
*** 7,36 ****
  public abstract class MockObjectSuperImpl implements MockObject{
  	
  	//private static final Logger logger=Logger.getLogger(MockObjectSuperImpl.class.getName());
! 	private static final long NO_TIME_OUT=0;
  
  	public CalledMethod expect(String methodName, Class... vargs) {
! 		return expect(methodName,NO_TIME_OUT,vargs);
  	}
  
  	public CalledMethod expect(Object returnValue, String methodName, Class... vargs) {
! 		return expect(returnValue,methodName,NO_TIME_OUT,vargs);
  	}
  
  	public CalledMethod expect(String methodName, Throwable throwable, Class... vargs) {
  		
! 		return expect(methodName,throwable,NO_TIME_OUT,vargs);
  	}
  
  	public CalledMethod expect(String methodName, Behavior behavior, Class... params) {
  		
! 		return expect(methodName,behavior,NO_TIME_OUT,params);
  	}
  
  	public CalledMethod expect(String methodName, long timeout, Class... vargs) {
! 		
  		return null;
  	}
  
  	public CalledMethod expect(Object returnValue, String methodName, long timeout, Class... vargs) {
  		// TODO Auto-generated method stub
--- 9,51 ----
  public abstract class MockObjectSuperImpl implements MockObject{
  	
+ 
+ 	private static final Logger logger=Logger.getLogger(MockObjectSuperImpl.class.getName());
+ 	private static final long DEFAULT_TIME_OUT=10000;
+ 
  	//private static final Logger logger=Logger.getLogger(MockObjectSuperImpl.class.getName());
! 
! 
  
  	public CalledMethod expect(String methodName, Class... vargs) {
! 		return expect(methodName,DEFAULT_TIME_OUT,vargs);
  	}
+ 	
+ 
  
  	public CalledMethod expect(Object returnValue, String methodName, Class... vargs) {
! 		return expect(returnValue,methodName,DEFAULT_TIME_OUT,vargs);
  	}
  
+ 	
+ 
  	public CalledMethod expect(String methodName, Throwable throwable, Class... vargs) {
  		
! 		return expect(methodName,throwable,DEFAULT_TIME_OUT,vargs);
  	}
  
  	public CalledMethod expect(String methodName, Behavior behavior, Class... params) {
  		
! 		return expect(methodName,behavior,DEFAULT_TIME_OUT,params);
  	}
  
+ 
  	public CalledMethod expect(String methodName, long timeout, Class... vargs) {
! 		if(methodName==null)
! 			throw new IllegalArgumentException("methd name can not be null");
! 		verify(timeout);
  		return null;
  	}
  
+ 
  	public CalledMethod expect(Object returnValue, String methodName, long timeout, Class... vargs) {
  		// TODO Auto-generated method stub
***************
*** 48,52 ****
  	}
  
! 	public void verify() {
  		// TODO Auto-generated method stub
  		
--- 63,67 ----
  	}
  
! 	public void verify(long timeout) {
  		// TODO Auto-generated method stub