[Mocklib-checkins] mocklib3/input/javasrc/biz/xsoftware/test/mock TestMockCreator.java, 1.5, 1.6

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

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

Modified Files:
	TestMockCreator.java 
Log Message:
refactor mocklib back to original api.

Index: TestMockCreator.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock/TestMockCreator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestMockCreator.java	11 Sep 2006 15:03:59 -0000	1.5
--- TestMockCreator.java	13 Sep 2006 03:09:00 -0000	1.6
***************
*** 91,95 ****
  		MockObject car = MockObjectFactory.createMock(Car.class);
  		
! 		factory.addReturnValue(car, "createCar");
  		
  		//now we would normally tweak code on the subsystem which
--- 91,95 ----
  		MockObject car = MockObjectFactory.createMock(Car.class);
  		
! 		factory.addReturnValue("createCar", car);
  		
  		//now we would normally tweak code on the subsystem which
***************
*** 104,108 ****
  	public void testThrowCheckedException() throws Exception {
  		MockObject mockList = MockObjectFactory.createMock(ListenerOne.class);
! 		mockList.addThrowException(new IOException("test throwing IOException"), "callMeSecond");
  		
  		ListenerOne l = (ListenerOne)mockList;
--- 104,108 ----
  	public void testThrowCheckedException() throws Exception {
  		MockObject mockList = MockObjectFactory.createMock(ListenerOne.class);
! 		mockList.addThrowException("callMeSecond", new IOException("test throwing IOException"));
  		
  		ListenerOne l = (ListenerOne)mockList;
***************
*** 149,153 ****
          MockObject mock = MockObjectFactory.createMock(Identical.class);
          
!         mock.setDefaultReturnValue(new byte[] {4}, "doThat");
          
          Identical ident = (Identical)mock;
--- 149,153 ----
          MockObject mock = MockObjectFactory.createMock(Identical.class);
          
!         mock.setDefaultReturnValue("doThat", new byte[] {4});
          
          Identical ident = (Identical)mock;
***************
*** 163,169 ****
      {
          MockObject mock = MockObjectFactory.createMock(Identical.class);
!         mock.addReturnValue(new byte[] {3}, "doThat");
!         mock.setDefaultReturnValue(new byte[] {4}, "doThat");
!         mock.addReturnValue(new byte[] {5}, "doThat");
          
          Identical ident = (Identical)mock;
--- 163,169 ----
      {
          MockObject mock = MockObjectFactory.createMock(Identical.class);
!         mock.addReturnValue("doThat", new byte[] {3});
!         mock.setDefaultReturnValue("doThat", new byte[] {4});
!         mock.addReturnValue("doThat", new byte[] {5});
          
          Identical ident = (Identical)mock;
***************
*** 193,197 ****
          FactoryInterface factory = (FactoryInterface)mock;
          
!         mock.addReturnValue(new CarImpl(), "createCar");
          Car car = factory.createCar("id");
          
--- 193,197 ----
          FactoryInterface factory = (FactoryInterface)mock;
          
!         mock.addReturnValue("createCar", new CarImpl());
          Car car = factory.createCar("id");
          
***************
*** 217,221 ****
          Car car = (Car)mock;
          try {
!             mock.addReturnValue(new Long(56), "getWheelCount");
              car.getWheelCount();
              fail("should have thrown exception");
--- 217,221 ----
          Car car = (Car)mock;
          try {
!             mock.addReturnValue("getWheelCount", new Long(56));
              car.getWheelCount();
              fail("should have thrown exception");
***************
*** 239,243 ****
          
          Car car = (Car)mock;
!         mock.addReturnValue(new Integer(5), "getWheelCount");
          car.getWheelCount();
  
--- 239,243 ----
          
          Car car = (Car)mock;
!         mock.addReturnValue("getWheelCount", new Integer(5));
          car.getWheelCount();
  
***************
*** 248,252 ****
          MockObject mock = MockObjectFactory.createMock(Identical.class);
          
!         mock.addBehavior(new MyTestBehavior(), "doThat");
  
          Identical ident = (Identical)mock;
--- 248,252 ----
          MockObject mock = MockObjectFactory.createMock(Identical.class);
          
!         mock.addBehavior("doThat", new MyTestBehavior());
  
          Identical ident = (Identical)mock;