[Mocklib-checkins] mocklib3/input/javasrc/biz/xsoftware/test/mock MyTestBehavior.java, NONE, 1.1 TestMockCreator.java, 1.3, 1.4 TestOrderedCalls.java, 1.3, 1.4 MockOne.java, 1.1, 1.2 OldBehavior.java, 1.1, NONE TestUnorderedCalls.java, 1.1, NONE

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

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

Modified Files:
	TestMockCreator.java TestOrderedCalls.java MockOne.java 
Added Files:
	MyTestBehavior.java 
Removed Files:
	OldBehavior.java TestUnorderedCalls.java 
Log Message:
changes to implementation.

--- TestUnorderedCalls.java DELETED ---

Index: TestMockCreator.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock/TestMockCreator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMockCreator.java	10 Sep 2006 18:44:06 -0000	1.3
--- TestMockCreator.java	10 Sep 2006 20:45:04 -0000	1.4
***************
*** 252,256 ****
          MockObject mock = MockObjectFactory.createMock(Identical.class);
          
!         mock.addBehavior(new OldBehavior(), "doThat");
  
          Identical ident = (Identical)mock;
--- 252,256 ----
          MockObject mock = MockObjectFactory.createMock(Identical.class);
          
!         mock.addBehavior(new MyTestBehavior(), "doThat");
  
          Identical ident = (Identical)mock;

--- NEW FILE: MyTestBehavior.java ---
/**
 * 
 */
package biz.xsoftware.test.mock;

import biz.xsoftware.mock.Behavior;

class MyTestBehavior implements Behavior {

    /**
     * @see biz.xsoftware.mock.Behavior#clone(java.lang.Object[])
     */
    public Object[] doThatCloner(byte[] bytes)
    {
        byte[] newBytes = new byte[bytes.length];
        for(int i = 0; i < newBytes.length; i++) {
            newBytes[i] = bytes[i];
        }
        return new Object[] {newBytes};
    }

    /**
     * @see biz.xsoftware.mock.Behavior#runMethod(java.lang.Object[])
     */
    public byte[] doThat(byte[] bytes)
    {
        //we know the test does an 4 byte array, so do that
        
        for(int i = 0; i < 4; i++) {
            bytes[i+4] = bytes[i];
        }
        
        //make sure to return the same byte buffer so we are really testing this...
        return bytes;
    }
    
}
--- OldBehavior.java DELETED ---

Index: MockOne.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/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	10 Sep 2006 18:25:48 -0000	1.1
--- MockOne.java	10 Sep 2006 20:45:04 -0000	1.2
***************
*** 7,11 ****
  package biz.xsoftware.test.mock;
  
! import biz.xsoftware.mock.MockSuperclass;
  
  /**
--- 7,11 ----
  package biz.xsoftware.test.mock;
  
! import biz.xsoftware.mock.impl.MockSuperclass;
  
  /**

Index: TestOrderedCalls.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib3/input/javasrc/biz/xsoftware/test/mock/TestOrderedCalls.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestOrderedCalls.java	10 Sep 2006 18:44:06 -0000	1.3
--- TestOrderedCalls.java	10 Sep 2006 20:45:04 -0000	1.4
***************
*** 32,36 ****
  		MockOne one = new MockOne(3000);
  		one.callMeFirst(4);
! 		one.expectCall(MockOne.FIRST);
  	}
  	
--- 32,36 ----
  		MockOne one = new MockOne(3000);
  		one.callMeFirst(4);
! 		one.expect(MockOne.FIRST);
  	}
  	
***************
*** 45,49 ****
  		};
  		r.start();
! 		one.expectCall(MockOne.FIRST);
  	}
  	
--- 45,49 ----
  		};
  		r.start();
! 		one.expect(MockOne.FIRST);
  	}
  	
***************
*** 54,58 ****
  		
  		String[] evts = new String[] { MockOne.FIRST, MockOne.SECOND };
! 		one.expectOrderedCalls(evts);
  	}
  
--- 54,58 ----
  		
  		String[] evts = new String[] { MockOne.FIRST, MockOne.SECOND };
! 		one.expect(evts);
  	}
  
***************
*** 70,74 ****
  		
  		String[] evts = new String[] { MockOne.FIRST, MockOne.SECOND };
! 		one.expectOrderedCalls(evts);
  	}
  	
--- 70,74 ----
  		
  		String[] evts = new String[] { MockOne.FIRST, MockOne.SECOND };
! 		one.expect(evts);
  	}
  	
***************
*** 80,84 ****
  		String[] evts = new String[] { MockOne.SECOND, MockOne.FIRST };
  		try {
! 			one.expectOrderedCalls(evts);
  			fail("Should have failed this test case");
  		} catch(ExpectFailedException e) { /*gulp*/ }
--- 80,84 ----
  		String[] evts = new String[] { MockOne.SECOND, MockOne.FIRST };
  		try {
! 			one.expect(evts);
  			fail("Should have failed this test case");
  		} catch(ExpectFailedException e) { /*gulp*/ }
***************
*** 98,102 ****
  		try {
  			r.run();
! 			one.expectOrderedCalls(evts);
  			fail("Should have failed this test case");
  		} catch(ExpectFailedException e) { /*gulp*/ }
--- 98,102 ----
  		try {
  			r.run();
! 			one.expect(evts);
  			fail("Should have failed this test case");
  		} catch(ExpectFailedException e) { /*gulp*/ }
***************
*** 111,115 ****
  		String[] evts = new String[] { MockOne.FIRST, MockOne.SECOND };
  		try {
! 			one.expectOrderedCalls(evts);
  			fail("Should have failed this test case");
  		} catch(ExpectFailedException e) { /*gulp*/ }		
--- 111,115 ----
  		String[] evts = new String[] { MockOne.FIRST, MockOne.SECOND };
  		try {
! 			one.expect(evts);
  			fail("Should have failed this test case");
  		} catch(ExpectFailedException e) { /*gulp*/ }		
***************
*** 129,133 ****
  		one.callMeSecond("dummy");
  		String[] methods = new String[] {MockOne.FIRST, MockOne.SECOND };
! 		one.expectOrderedCalls(methods);
  	}
  
--- 129,133 ----
  		one.callMeSecond("dummy");
  		String[] methods = new String[] {MockOne.FIRST, MockOne.SECOND };
! 		one.expect(methods);
  	}