[Mocklib-checkins] mocklib2/input/javasrc/biz/xsoftware/test/mock CarImpl.java, NONE, 1.1 Car.java, 1.1, 1.2 TestMockCreator.java, 1.7, 1.8

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

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

Modified Files:
	Car.java TestMockCreator.java 
Added Files:
	CarImpl.java 
Log Message:
fix mocklib bug.

Index: Car.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/test/mock/Car.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Car.java	1 Jan 2006 00:35:56 -0000	1.1
--- Car.java	1 Sep 2006 16:31:43 -0000	1.2
***************
*** 18,20 ****
--- 18,21 ----
  	public void closeDoor();
  	
+     public int getWheelCount();
  }

Index: TestMockCreator.java
===================================================================
RCS file: /cvsroot/mocklib/mocklib2/input/javasrc/biz/xsoftware/test/mock/TestMockCreator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestMockCreator.java	25 Aug 2006 22:31:55 -0000	1.7
--- TestMockCreator.java	1 Sep 2006 16:31:43 -0000	1.8
***************
*** 8,11 ****
--- 8,12 ----
  
  import java.io.IOException;
+ 
  import junit.framework.TestCase;
  import junit.framework.TestSuite;
***************
*** 14,19 ****
  import biz.xsoftware.mock.CalledMethod;
  import biz.xsoftware.mock.ExpectFailedException;
- import biz.xsoftware.mock.MockObjectFactory;
  import biz.xsoftware.mock.MockObject;
  
  /**
--- 15,20 ----
  import biz.xsoftware.mock.CalledMethod;
  import biz.xsoftware.mock.ExpectFailedException;
  import biz.xsoftware.mock.MockObject;
+ import biz.xsoftware.mock.MockObjectFactory;
  
  /**
***************
*** 164,168 ****
      }
      
!     public void testDefaultReturnWithOtherReturns()
      {
          MockObject mock = MockObjectFactory.createMock(Identical.class);
--- 165,169 ----
      }
      
!    public void testDefaultReturnWithOtherReturns()
      {
          MockObject mock = MockObjectFactory.createMock(Identical.class);
***************
*** 191,194 ****
--- 192,243 ----
      }
      
+         
+     public void testReturnInterface() {
+         MockObject mock = MockObjectFactory.createMock(FactoryInterface.class);
+         
+         FactoryInterface factory = (FactoryInterface)mock;
+         
+         mock.addReturnValue("createCar", new CarImpl());
+         Car car = factory.createCar("id");
+         
+         assertEquals(car.getClass(), CarImpl.class);
+         
+         mock.expect("createCar");
+     }
+     
+ 
+     public void testReturnNull() {
+         MockObject mock = MockObjectFactory.createMock(FactoryInterface.class);
+         
+         FactoryInterface factory = (FactoryInterface)mock;
+         
+         factory.createCar("aaa");
+         
+         mock.expect("createCar");
+     }
+     
+     public void testBadPrimitive() {
+         MockObject mock = MockObjectFactory.createMock(Car.class);
+         
+         Car car = (Car)mock;
+         try {
+             mock.addReturnValue("getWheelCount", new Long(56));
+             car.getWheelCount();
+             fail("should have thrown exception");
+         } catch(IllegalArgumentException e) {
+         }
+     }    
+     
+     public void testNullPrimitive() {
+         MockObject mock = MockObjectFactory.createMock(Car.class);
+         
+         Car car = (Car)mock;
+         try {
+             car.getWheelCount();
+             fail("should have thrown exception");
+         } catch(IllegalArgumentException e) {
+         }
+     }        
+     
      public void testBehavior() {
          MockObject mock = MockObjectFactory.createMock(Identical.class);

--- NEW FILE: CarImpl.java ---
/**
 *  Copyright (C) 2006 Carrier Access, Corp.
 */
package biz.xsoftware.test.mock;

/**
 */
public class CarImpl implements Car
{

    /**
     * @see biz.xsoftware.test.mock.Car#openDoor()
     */
    public void openDoor()
    {
    }

    /**
     * @see biz.xsoftware.test.mock.Car#closeDoor()
     */
    public void closeDoor()
    {
    }

    /**
     * @see biz.xsoftware.test.mock.Car#getWheelCount()
     */
    public int getWheelCount()
    {
        return 0;
    }

}