mocklib-checkins

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

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

Modified Files:
	MockObjectSuperImpl.java 
Added Files:
	MockObjectFactoryImpl.java MockObjectImpl.java 
Log Message:
get build passing again by modifying design slightly and in some cases modifying code to adhere to design.

--- NEW FILE: MockObjectImpl.java ---
package biz.xsoftware.mock2.impl;

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
	}

	public MockObjectImpl(Class interfaceToMock, Object realObject) {
		// TODO Auto-generated constructor stub
	}

	public Object invoke(Object proxy, Method method, Object[] args)
			throws Throwable {
		// TODO Auto-generated method stub
		return null;
	}

}

--- NEW FILE: MockObjectFactoryImpl.java ---
package biz.xsoftware.mock2.impl;

import java.lang.reflect.Proxy;

import biz.xsoftware.mock2.MockObject;
import biz.xsoftware.mock2.MockObjectFactory;

public class MockObjectFactoryImpl extends MockObjectFactory {

	public static MockObject createMock(Class[] interfacesToMock) {
		Class[] interfacesPlusMock = new Class[interfacesToMock.length + 1];
		interfacesPlusMock[0] = MockObject.class;
		for (int i = 1; i < interfacesPlusMock.length; i++) {
			interfacesPlusMock[i] = interfacesToMock[i - 1];
		}

		ClassLoader cl = MockObjectFactory.class.getClassLoader();
		MockObjectImpl impl = new MockObjectImpl(interfacesToMock);
		Object o = Proxy.newProxyInstance(cl, interfacesPlusMock, impl);
		MockObject m = (MockObject) o;
		return m;
	}

	public static MockObject createMock(Class interfaceToMock) {
		return createMock(new Class[] { interfaceToMock });
	}

	public static MockObject createMock(Class interfaceToMock, Object realObject) {
		// TODO: Implement me!
		Class[] interfacePlusMock = new Class[1];
		interfacePlusMock[0] = MockObject.class;

		ClassLoader cl = MockObjectFactory.class.getClassLoader();
		MockObjectImpl impl = new MockObjectImpl(interfaceToMock, realObject);
		Object o = Proxy.newProxyInstance(cl, interfacePlusMock, impl);
		MockObject m = (MockObject) o;
		return m;
	}	
}

Index: MockObjectSuperImpl.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/mock2/impl/MockObjectSuperImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MockObjectSuperImpl.java	5 Jan 2006 15:09:59 -0000	1.2
--- MockObjectSuperImpl.java	13 Jan 2006 14:48:31 -0000	1.3
***************
*** 1,6 ****
  package biz.xsoftware.mock2.impl;
  
- import java.util.logging.Logger;
- 
  import biz.xsoftware.mock2.Behavior;
  import biz.xsoftware.mock2.CalledMethod;
--- 1,4 ----
***************
*** 9,49 ****
  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
  		return null;
  	}
  
! 	public CalledMethod expect(String methodName, Throwable throwable, long timeout, Class[] vargs) {
  		// TODO Auto-generated method stub
  		return null;
  	}
  
! 	public CalledMethod expect(String methodName, Behavior behavior, long timeout, Class[] params) {
  		// TODO Auto-generated method stub
  		return null;
--- 7,47 ----
  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
  		return null;
  	}
  
! 	public CalledMethod expect(String methodName, Throwable throwable, long timeout, Class... vargs) {
  		// TODO Auto-generated method stub
  		return null;
  	}
  
! 	public CalledMethod expect(String methodName, Behavior behavior, long timeout, Class... params) {
  		// TODO Auto-generated method stub
  		return null;
***************
*** 55,69 ****
  	}
  
! 	public void addIgnoreMethod(String methodName, Class[] vargs) {
  		// TODO Auto-generated method stub
  		
  	}
  
! 	public void removeIgnoreMethod(String methodName, Class[] vargs) {
  		// TODO Auto-generated method stub
  		
  	}
  
! 	public void setDefaultReturnValue(Object returnValue, String methodName, Class[] vargs) {
  		// TODO Auto-generated method stub
  		
--- 53,67 ----
  	}
  
! 	public void addIgnoreMethod(String methodName, Class... vargs) {
  		// TODO Auto-generated method stub
  		
  	}
  
! 	public void removeIgnoreMethod(String methodName, Class... vargs) {
  		// TODO Auto-generated method stub
  		
  	}
  
! 	public void setDefaultReturnValue(Object returnValue, String methodName, Class... vargs) {
  		// TODO Auto-generated method stub