Changes to support MightyMock integration into MXUnit

bobsilverberg · Nov 28, 2009 · 0efea63 · 0efea63
1 parent d8417ea
commit 0efea63
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 15 deletions.
diff --git a/MightyMock.cfc b/MightyMock.cfc
@@ -22,28 +22,35 @@
    };
 
    if( arguments.size() eq 1){
-     mocked.name = arguments[1];
-     return this;
+	 if (isObject(arguments[1])) {
+		return createTypeSafeMock(arguments[1]);
+	 } else {
+	    mocked.name = arguments[1];
+	    return this;
+	 }
    }
 
    /*
-     Make multiple type safe mocks.
+     Make a type safe mock.
    */
    if( arguments.size() eq 2 ) {
-	   try{
-	    return createMultipleTypeSafeMocks(arguments[1]);
-		 }
-		 catch (coldfusion.runtime.CfJspPage$NoSuchTemplateException e){
-		     _$throw('InvalidMockException',e.getMessage(),e.getDetail());
-		 }
+	    return createTypeSafeMock(arguments[1]);
   }
  }
 
 
  //Clears all methods in object to be mocked.
- function createMultipleTypeSafeMocks(name){
-     var proxy = createObject('component', name);
-     mocked.name = name;
+ function createTypeSafeMock(mockee){
+     var proxy = 0;
+	try{
+	 if (not IsObject(mockee)) {
+	 	proxy = createObject('component', mockee);
+     	mocked.name = mockee;
+	 } else {
+	 	proxy = mockee;
+      	mocked.name = getMetaData(mockee).name;
+	 }
+
      proxy.snif = _$snif; //sniffer for variables scope
      proxyVars = proxy.snif();
 
@@ -131,6 +138,10 @@
 			proxy.variables._$DUMP = _$DUMP;
 
      return proxy;
+	 }
+	 catch (coldfusion.runtime.CfJspPage$NoSuchTemplateException e){
+	     _$throw('InvalidMockException',e.getMessage(),e.getDetail());
+	 }
 
  }
 

diff --git a/MockFactory.cfc b/MockFactory.cfc
@@ -0,0 +1,25 @@
+<cfcomponent displayname="MockFactory" output="false">
+
+	<cffunction name="init">
+		<cfscript>
+			return this;
+		</cfscript>
+	</cffunction>
+
+	<cffunction name="createMock">
+		<cfargument name="mocked" required="false" default="" />
+		<cfargument name="mockType" required="false" default="fast" />
+		<cfswitch expression="#arguments.mockType#">
+			<cfcase value="fast">
+				<cfreturn createObject("component","MightyMock").init(arguments.mocked) />
+			</cfcase>
+			<cfcase value="typeSafe">
+				<cfreturn createObject("component","MightyMock").init(arguments.mocked,true) />
+			</cfcase>
+			<cfcase value="partial">
+				<cfthrow type="MightyMock.MockFactory.partialMocksNotImplemented" message="Partial mocks are not available via MightyMock yet." />
+			</cfcase>
+		</cfswitch>
+	</cffunction>
+
+</cfcomponent>
diff --git a/test/MockFactoryTest.cfc b/test/MockFactoryTest.cfc
@@ -1,6 +1,15 @@
 <cfcomponent output="false" extends="BaseTest">
+
+<cffunction name="createPartialShouldThrow" mxunit:expectedException="MightyMock.MockFactory.partialMocksNotImplemented">
+	<cfset 	mock = mf.createMock("mxunit.framework.TestCase","partial") />
+</cffunction>
+
+
 <cfscript>
 
+/* Bill's tests for MightyMockFactory.cfc
+	Now using this test component to test MockFactory.cfc used for MXUnit integration
+	
 function testMockCreation(){
    mock1 = $('foo');
    assertIsTypeOf(mock1,'foo');
@@ -9,9 +18,37 @@ function testMockCreation(){
    debug(mock2);
    assertIsTypeOf(mock2,'WEB-INF.cftags.component');
 }
+*/
+
+function createNoNameNoTypeShouldCreateNamelessFastMock() {
+	mock = mf.createMock();
+	assertIsTypeOf(mock,"MightyMock.MightyMock");
+	assertEquals("",mock.getMocked().name);
+}
+
 
+function createNameedNoTypeShouldCreateNamedFastMock() {
+	mock = mf.createMock("foo");
+	assertIsTypeOf(mock,"MightyMock.MightyMock");
+	assertEquals("foo",mock.getMocked().name);
+}
+
+function createTypeSafeShouldCreateTypeSafeMock() {
+	mock = mf.createMock("mxunit.framework.TestCase","typeSafe");
+	assertIsTypeOf(mock,"mxunit.framework.TestCase");
+	assertEquals("mxunit.framework.TestCase",mock.getMocked().name);
+}
+
+function createWithActualObjectShouldCreateTypeSafeMock() {
+	testCase = createObject("component","mxunit.framework.TestCase");
+	mock = mf.createMock(testCase);
+	assertIsTypeOf(mock,"mxunit.framework.TestCase");
+	assertEquals("mxunit.framework.TestCase",mock.getMocked().name);
+}
 
   function setUp(){
+
+  mf = createObject("component","MightyMock.MockFactory");
 
   }
 

diff --git a/test/ReturnTypeTest.cfc b/test/ReturnTypeTest.cfc
@@ -22,9 +22,20 @@ function testThatInitIsCallingCreateTypeSafeMocks(){
 
 }
 
-function testCreateMultiplTypeSafeMocks(){
-  mymock =  createObject('component','mightymock.MightyMock').createMultipleTypeSafeMocks(dummy);
-  mymock2 =  createObject('component','mightymock.MightyMock').createMultipleTypeSafeMocks(mockery);
+function testCreateTypeSafeMock(){
+  mymock =  createObject('component','mightymock.MightyMock').createTypeSafeMock(dummy);
+  mymock2 =  createObject('component','mightymock.MightyMock').createTypeSafeMock(mockery);
+  assertIsTypeOf(mymock, 'mightymock.test.fixture.Dummy');
+  assertIsTypeOf(mymock2, 'mightymock.test.fixture.Mockery');
+  assertIsTypeOf(mock, 'mightymock.test.fixture.Dummy');
+
+}
+
+function testCreateTypeSafeMockWithObject(){
+  dummy =  createObject('component',dummy);
+  mockery =  createObject('component',mockery);
+  mymock =  createObject('component','mightymock.MightyMock').createTypeSafeMock(dummy);
+  mymock2 =  createObject('component','mightymock.MightyMock').createTypeSafeMock(mockery);
   assertIsTypeOf(mymock, 'mightymock.test.fixture.Dummy');
   assertIsTypeOf(mymock2, 'mightymock.test.fixture.Mockery');
   assertIsTypeOf(mock, 'mightymock.test.fixture.Dummy');