[Mocklib-checkins] mocklib2/input/javasrc/biz/xsoftware/test/mock TestMockCreator.java, 1.5, 1.6 MockOne.java, 1.1, 1.2

[dadrox <da...@us...>]

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

Modified Files:
	TestMockCreator.java MockOne.java 
Log Message:
added add/removeIgnore and did some minor cleanup

Index: MockOne.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/test/mock/MockOne.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MockOne.java	1 Jan 2006 00:35:56 -0000	1.1
--- MockOne.java	25 Aug 2006 19:42:08 -0000	1.2
***************
*** 52,56 ****
  	 * @see biz.xsoftware.mock.MockSuperclass#getClasses()
  	 */
! 	public Class[] getClasses() {
  		return new Class[] { MockOne.class };
  	}
--- 52,57 ----
  	 * @see biz.xsoftware.mock.MockSuperclass#getClasses()
  	 */
! 	@Override
!     public Class[] getClasses() {
  		return new Class[] { MockOne.class };
  	}

Index: TestMockCreator.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/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	25 Aug 2006 17:26:28 -0000	1.5
--- TestMockCreator.java	25 Aug 2006 19:42:08 -0000	1.6
***************
*** 95,99 ****
  		MockObject car = MockObjectFactory.createMock(Car.class);
  		
! 		factory.addReturnValue("createCar", (Car)car);
  		
  		//now we would normally tweak code on the subsystem which
--- 95,99 ----
  		MockObject car = MockObjectFactory.createMock(Car.class);
  		
! 		factory.addReturnValue("createCar", car);
  		
  		//now we would normally tweak code on the subsystem which
***************
*** 169,187 ****
          mock.addReturnValue("doThat", new byte[] {3});
          mock.setDefaultReturnValue("doThat", new byte[] {4});
          
          Identical ident = (Identical)mock;
!         byte[] retVal1 = ident.doThat(null);
!         
          mock.expect("doThat");
          
!         assertEquals(1, retVal1.length);
!         assertEquals(3, retVal1[0]);
  
!         byte[] retVal2 = ident.doThat(null);
          
          mock.expect("doThat");
          
!         assertEquals(1, retVal2.length);
!         assertEquals(4, retVal2[0]);
      }
      
--- 169,192 ----
          mock.addReturnValue("doThat", new byte[] {3});
          mock.setDefaultReturnValue("doThat", new byte[] {4});
+         mock.addReturnValue("doThat", new byte[] {5});
          
          Identical ident = (Identical)mock;
!         byte[] retVal = ident.doThat(null);
          mock.expect("doThat");
          
!         assertEquals(1, retVal.length);
!         assertEquals(3, retVal[0]);
  
!         retVal = ident.doThat(null);
!         mock.expect("doThat");
          
+         assertEquals(1, retVal.length);
+         assertEquals(5, retVal[0]);
+ 
+         retVal = ident.doThat(null);
          mock.expect("doThat");
          
!         assertEquals(1, retVal.length);
!         assertEquals(4, retVal[0]);
      }