[Mocklib-checkins] mocklib2/input/javasrc/biz/xsoftware/test/mock2 TestMockCreator.java,1.13,1.14

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

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

Modified Files:
	TestMockCreator.java 
Log Message:


Index: TestMockCreator.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/test/mock2/TestMockCreator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** TestMockCreator.java	25 Mar 2006 08:17:25 -0000	1.13
--- TestMockCreator.java	27 Mar 2006 15:44:31 -0000	1.14
***************
*** 258,262 ****
  	}
      
!     public void testIgnoreMethod(){
          MockObject m=MockObjectFactory.createMock(ListenerOne.class);
          ListenerOne l=(ListenerOne)m;
--- 258,262 ----
  	}
      
!     public void testIgnoreAndDefaultRetValMethod(){
          MockObject m=MockObjectFactory.createMock(ListenerOne.class);
          ListenerOne l=(ListenerOne)m;
***************
*** 269,304 ****
          
        
          m.addIgnoreMethod(methodName1);
!         CalledMethod callWithRetVal=m.expect(methodName1);
          CalledMethod callMeLast=m.expect(methodName2);
          m.removeIgnoreMethod(methodName1);
!         CalledMethod backCall=m.expect(methodName1);
         
          l.callMeFirst(param1);
          l.callMeLast(param2);
          l.callMeFirst(param1);
!         
!         m.verify();
!        
!    }
!     
!     
!     public void testSetDefaultRetVal(){
!         MockObject m1=MockObjectFactory.createMock(ListenerOne.class);
!         ListenerOne l=(ListenerOne)m1;
!         
!         FakeSystem fm=new FakeSystem();
          
          
!         String methodName1="getFake";
!         m1.setDefaultReturnValue(new FakeSystem(),methodName1);
!         CalledMethod getFake=m1.expect(methodName1);
          
-         FakeSystem fs=l.getFakeSystem();
-         fs.getId();
          
          
          
!     }
  	
  //	private static byte[] cloneBytes(byte[] data) {
--- 269,300 ----
          
        
+        
+         CalledMethod callMeFirst=m.expect(methodName1);
          m.addIgnoreMethod(methodName1);
!         m.setDefaultReturnValue("retval",methodName1);
          CalledMethod callMeLast=m.expect(methodName2);
+         CalledMethod callAgain=m.expect(methodName1);
          m.removeIgnoreMethod(methodName1);
!         CalledMethod callLastAgain=m.expect(methodName2);
!         CalledMethod callThirdTime=m.expect(methodName1);
         
          l.callMeFirst(param1);
          l.callMeLast(param2);
          l.callMeFirst(param1);
!         l.callMeLast(param2);
!         l.callMeFirst(param1);
          
          
!         m.verify();
          
          
+     
          
          
!        
!    }
!     
!     
!    
  	
  //	private static byte[] cloneBytes(byte[] data) {