From: Griffin C. <gc...@us...> - 2005-04-23 21:57:09
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock/Dynamic/Generate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5606/DotNetMock/Dynamic/Generate Modified Files: ClassGenerator.cs Log Message: - Minor Refactorings Index: ClassGenerator.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/Dynamic/Generate/ClassGenerator.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ClassGenerator.cs 23 Apr 2005 21:53:33 -0000 1.11 --- ClassGenerator.cs 23 Apr 2005 21:57:00 -0000 1.12 *************** *** 73,88 **** classBuilder.ImplementMockedMethod( mi ); } ! // create type ! classBuilder.Compile( ); ! object newMockObject = ! Activator.CreateInstance( classBuilder.MockClass ); ! // set handler field ! classBuilder.HandlerField.SetValue( newMockObject, handler ); ! // save if necessary ! if ( _assemblyFilename != null ) ! { ! _assemblyBuilder.Save( _assemblyFilename ); ! } ! return newMockObject; } /// <summary> --- 73,77 ---- classBuilder.ImplementMockedMethod( mi ); } ! return compileAndGenerateMock( classBuilder, handler ); } /// <summary> *************** *** 105,108 **** --- 94,101 ---- classBuilder.ImplementMockedMethod( ms.MethodName, ms.ReturnType, ms.ParamTypes ); } + return compileAndGenerateMock( classBuilder, handler ); + } + private object compileAndGenerateMock( MockClassBuilder classBuilder, IMockedCallHandler handler ) + { // create type classBuilder.Compile( ); |