Menu
▾
▴
dotnetmock-commits — email list for commits to the CVS repository
This list is closed, nobody may subscribe to it.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(99) |
Feb
(163) |
Mar
(3) |
Apr
(33) |
May
(8) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
(10) |
Apr
|
May
|
Jun
(16) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Choy R. <ch...@us...> - 2005-02-13 10:46:12
|
Update of /cvsroot/dotnetmock/dotnetmock/doc/images/admons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2559/admons Log Message: Directory /cvsroot/dotnetmock/dotnetmock/doc/images/admons added to the repository |
|
From: Choy R. <ch...@us...> - 2005-02-13 10:45:58
|
Update of /cvsroot/dotnetmock/dotnetmock/doc/reference In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2401/reference Log Message: Directory /cvsroot/dotnetmock/dotnetmock/doc/reference added to the repository |
|
From: Choy R. <ch...@us...> - 2005-02-13 10:45:58
|
Update of /cvsroot/dotnetmock/dotnetmock/doc/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2401/images Log Message: Directory /cvsroot/dotnetmock/dotnetmock/doc/images added to the repository |
|
From: Choy R. <ch...@us...> - 2005-02-13 10:45:58
|
Update of /cvsroot/dotnetmock/dotnetmock/doc/docbook In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2401/docbook Log Message: Directory /cvsroot/dotnetmock/dotnetmock/doc/docbook added to the repository |
|
From: Choy R. <ch...@us...> - 2005-02-13 10:45:53
|
Update of /cvsroot/dotnetmock/dotnetmock/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2326/doc Log Message: Directory /cvsroot/dotnetmock/dotnetmock/doc added to the repository |
|
From: Griffin C. <gc...@us...> - 2005-02-12 19:02:17
|
Update of /cvsroot/dotnetmock/dotnetmock/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28278/docs Modified Files: SupportingDifferentTestingFrameworks.txt Log Message: Index: SupportingDifferentTestingFrameworks.txt =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/docs/SupportingDifferentTestingFrameworks.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SupportingDifferentTestingFrameworks.txt 12 Feb 2005 18:49:03 -0000 1.6 --- SupportingDifferentTestingFrameworks.txt 12 Feb 2005 19:02:07 -0000 1.7 *************** *** 20,23 **** --- 20,31 ---- So, even if you have a certain version of one of the above frameworks in your GAC, you can override the version loaded by placing the desired version in your local path. + If you are upgrading from a previous release of DotNetMock, you can removed all the DotNetMock files you previously used, and replace them with DotNetMock.dll, and optionally, DotNetMock.Framework.dll. You do NOT need any of the other previous assemblies. These include: + + *DotNetMock.Core + * DotNetMock.NUnit.dll + * DotNetMock.MbUnitNamespace.dll + * DotNetMock.csUnitNamespace.dll + + Why? ---- |
|
From: Griffin C. <gc...@us...> - 2005-02-12 19:02:16
|
Update of /cvsroot/dotnetmock/dotnetmock/docs/ChangeLogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28278/docs/ChangeLogs Modified Files: Changes-0.7.4.txt Log Message: Index: Changes-0.7.4.txt =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/docs/ChangeLogs/Changes-0.7.4.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Changes-0.7.4.txt 12 Feb 2005 18:49:02 -0000 1.4 --- Changes-0.7.4.txt 12 Feb 2005 19:02:07 -0000 1.5 *************** *** 4,6 **** - Upgraded tests to use Nunit 2.2 - Upgraded build file to NAnt 0.85 ! - Including .pdb debugging symbols for DotNetMock \ No newline at end of file --- 4,7 ---- - Upgraded tests to use Nunit 2.2 - Upgraded build file to NAnt 0.85 ! - Including .pdb debugging symbols for DotNetMock ! - Removed csUnit, NUnit, and mbUnit namespaces projects for independent assemblies. \ No newline at end of file |
|
From: Griffin C. <gc...@us...> - 2005-02-12 18:54:16
|
Update of /cvsroot/dotnetmock/dotnetmock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24972 Modified Files: .cvsignore DotNetMock.build Log Message: - Added key file & clover license to cvs ignor - included debugging symbols in package Index: .cvsignore =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .cvsignore 1 Jan 2005 22:57:50 -0000 1.3 --- .cvsignore 12 Feb 2005 18:54:07 -0000 1.4 *************** *** 6,7 **** --- 6,9 ---- report DotNetMock.resharperoptions + dotnetmock.key + clovernet.license \ No newline at end of file Index: DotNetMock.build =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.build,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** DotNetMock.build 12 Feb 2005 18:30:55 -0000 1.21 --- DotNetMock.build 12 Feb 2005 18:54:07 -0000 1.22 *************** *** 165,168 **** --- 165,169 ---- <fileset basedir="${build.dir}"> <include name="*.dll" /> + <include name="*.pdb" /> </fileset> </copy> |
|
From: Griffin C. <gc...@us...> - 2005-02-12 18:49:11
|
Update of /cvsroot/dotnetmock/dotnetmock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22985 Modified Files: readme.txt Log Message: - Updated testing framework docs to reflect Choy's changes - Updated readme content for new version - Filled out changelog Index: readme.txt =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/readme.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** readme.txt 23 Aug 2004 22:55:56 -0000 1.4 --- readme.txt 12 Feb 2005 18:49:03 -0000 1.5 *************** *** 2,6 **** ------------------------------ ! This 0.7.0 release breaks two previous interfaces. Make sure to read the release notes and changelog for more information. --- 2,6 ---- ------------------------------ ! This is the 0.7.4 release of DotNetMock. Make sure to read the release notes and changelog for more information. *************** *** 24,31 **** This is the NAnt build file for the distribution. Doing a nant -projecthelp will print out the available targets for using DotNetMock ------------ Requirements ------------ ! * NAnt >= 0.84 * .NET Framework 1.1 ( Should work with 1.0. Hasn't been tested with Mono ) --- 24,40 ---- This is the NAnt build file for the distribution. Doing a nant -projecthelp will print out the available targets for using DotNetMock + -------------------------- + What's new in this release + -------------------------- + + Some of the new features are: + * Strongly named assemblies + * More dynamic loading of test frameworks. Framework support is no longer tied to a particular version + * Many more changes. Check out the change log in the docs directory for complete info. + ------------ Requirements ------------ ! * NAnt >= 0.85 rc1 * .NET Framework 1.1 ( Should work with 1.0. Hasn't been tested with Mono ) *************** *** 43,49 **** http://www.sourceforge.net/projects/dotnetmock ! or emailed directly to the author: ! gc...@us... Take care and happy mocking! --- 52,58 ---- http://www.sourceforge.net/projects/dotnetmock ! or emailed directly to the development team at: ! dot...@li... Take care and happy mocking! |
|
From: Griffin C. <gc...@us...> - 2005-02-12 18:49:11
|
Update of /cvsroot/dotnetmock/dotnetmock/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22985/docs Modified Files: SupportingDifferentTestingFrameworks.txt Log Message: - Updated testing framework docs to reflect Choy's changes - Updated readme content for new version - Filled out changelog Index: SupportingDifferentTestingFrameworks.txt =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/docs/SupportingDifferentTestingFrameworks.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SupportingDifferentTestingFrameworks.txt 17 Jun 2004 20:49:44 -0000 1.5 --- SupportingDifferentTestingFrameworks.txt 12 Feb 2005 18:49:03 -0000 1.6 *************** *** 5,40 **** ----- ! Originally, DotNetMock used NUnit internally. This proved to be a problem for projects using other testing frameworks, internal or external. With the 0.5.0 release, DotNetMock now provides initial support for using alternate frameworks. How? ---- ! Currently, DotNetMock ships with implementations for three testing frameworks, NUnit 2.1, csUnit, and MbUnit. To use either of these frameworks, simply copy the corresponding assembly, either DotNetMock.NUnit.dll, DotNetMock.csUnitNamespace.dll, or DotNetMock.MbUnitNamespace.dll along with the usual DotNetMock assemblies: ! ! * DotNetMock.dll ! * DotNetMock.Framework.dll ! * DotNetMock.Core.dll ! ! to your library directory. ! ! Then, you need to set two environment variables, DotNetMock_TestingComponent & DotNetMock_TestingAssembly. These two variables will signal to DotNetMock which testing components to use. DotNetMock_TestingComponent signifies the class implementating the ITestFramework interface and DotNetMock_TestingAssembly represents the local assembly that contains that class. The values of these variables for the currently supported frameworks are: ! ! For NUnit: ! DotNetMock_TestingComponent = "DotNetMock.NUnit.NUnitTestFramework" ! DotNetMock_TestingAssembly = "DotNetMock.NUnit" ! ! For csUnit: ! DotNetMock_TestingComponent = "DotNetMock.csUnitNamespace.csUnitTestFramework" ! DotNetMock_TestingAssembly = "DotNetMock.csUnitNamespace" ! ! For MbUnit: ! DotNetMock_TestingComponent = "DotNetMock.MbUnitNamespace.MbUnitTestFramework" ! DotNetMock_TestingAssembly = "DotNetMock.MbUnitNamespace" ! These environment variables will ensure that the correct instances for your framework will be created. ! If you want to use NUnit, you do NOT need to set any of these variables, as NUnit is the default and will be loaded as a last resort. ! This procedure might might be streamlined in the future, possibly loading classes as modules, instead of full blown assemblies. Why? --- 5,22 ---- ----- ! Originally, DotNetMock used NUnit internally. This proved to be a problem for projects using other testing frameworks, internal or external. With the 0.7.4 release, DotNetMock now provides support for using alternate frameworks. How? ---- ! Currently, DotNetMock ships with implementations for three testing frameworks, NUnit , csUnit, and MbUnit. To use either of these frameworks, simply make sure the corresponding dll is found somewhere within the applications path. This can either be the standard probing path for local dll's or in the GAC ! The framework will attempt to load a testing framrwork in the following order: ! * NUnit ! * MbUnit ! * csUnit ! So, even if you have a certain version of one of the above frameworks in your GAC, you can override the version loaded by placing the desired version in your local path. Why? *************** *** 42,58 **** Answers to some questions: - Q: Why environment variables, and not XXX ( XML configuration variables, Factories, switches, etc... ) - A: Because environment variables are the easiest to use in a library. Since most test assemblies are testing class libraries, environment variables make it easy to load variable information. Config files would work, but the information will end up having to be put into every .exe.config that calls DotNetMock, which would prove to be a hassle. - Q: I don't use either of the supported frameworks, so can I provide my own testing framework implementation? ! A: Yes, of course. Simple create a class that implements the DotNetMock.Core.ITestFramework interface. Then, make sure your compiled assembly can be found by DotNetMock, either in the GAC or in the same directory ( reccommended ). Finally, make sure to set the two enviornment variables found above. Q: Your implementation of (csUnit|NUnit|MbUnit) doesn't support my favorite assertion. Can this be added? ! A: Sure. The original implementations were meant to provide DotNetMock with enough funtionality to work. They are by no means feature complete. So, any missing features can be added. Simply drop me a line ( gc...@us... ) or make the changes yourself, and submit a patch to me. ! Having said all that, it should be clear that only feature common across testing frameworks can be supported. Framework specific features would break the general interfaces. I might support both implementations in the future, however. Any other questions or support issues should be submitted to http://www.sourceforge.net/projects/dotnetmock ! --Griffin ! ( gc...@us... ) \ No newline at end of file --- 24,37 ---- Answers to some questions: Q: I don't use either of the supported frameworks, so can I provide my own testing framework implementation? ! A: Not at this time. The only frameworks supported are the three above. If you would like to use your own framework, drop the developers a line at dot...@li... and we will see what we can do. Q: Your implementation of (csUnit|NUnit|MbUnit) doesn't support my favorite assertion. Can this be added? ! A: Sure. The original implementations were meant to provide DotNetMock with enough funtionality to work. They are by no means feature complete. So, any missing features can be added. Simply drop the developers a line ( dot...@li... ) or make the changes yourself, and submit a patch. ! Having said all that, it should be clear that only feature common across testing frameworks can be supported. Framework specific features would break the general interfaces. We might support both implementations in the future, however. Any other questions or support issues should be submitted to http://www.sourceforge.net/projects/dotnetmock ! -- The DotNetMock Development team ! ( dot...@li... ) \ No newline at end of file |
|
From: Griffin C. <gc...@us...> - 2005-02-12 18:49:11
|
Update of /cvsroot/dotnetmock/dotnetmock/docs/ChangeLogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22985/docs/ChangeLogs Modified Files: Changes-0.7.4.txt Log Message: - Updated testing framework docs to reflect Choy's changes - Updated readme content for new version - Filled out changelog Index: Changes-0.7.4.txt =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/docs/ChangeLogs/Changes-0.7.4.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Changes-0.7.4.txt 5 Feb 2005 21:47:10 -0000 1.3 --- Changes-0.7.4.txt 12 Feb 2005 18:49:02 -0000 1.4 *************** *** 2,3 **** --- 2,6 ---- - Dynamic loading of test assemblies - Moved ITestFramework from DotNetMock.Core assembly to DotNetMock assembly, while keeping namespace the same. + - Upgraded tests to use Nunit 2.2 + - Upgraded build file to NAnt 0.85 + - Including .pdb debugging symbols for DotNetMock \ No newline at end of file |
|
From: Griffin C. <gc...@us...> - 2005-02-12 18:31:04
|
Update of /cvsroot/dotnetmock/dotnetmock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15030 Modified Files: DotNetMock.build Log Message: - Upgraded build file to NAnt 0.85 rc2 Index: DotNetMock.build =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.build,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** DotNetMock.build 12 Feb 2005 06:30:57 -0000 1.20 --- DotNetMock.build 12 Feb 2005 18:30:55 -0000 1.21 *************** *** 1,43 **** ! <project name=".NET Mock Objects master build file" default="test"> <description>Master build file for .NET Mock Objects project</description> ! <property name="project.config" value="debug"/> ! <property name="debug.build" value="true"/> ! <property name="VisualStudioTemplates" value="VisualStudioTemplates"/> ! <property name="VisualStudioTemplates2003" value="VisualStudioTemplates2003"/> ! <property name="project.name" value="DotNetMock"/> ! <property name="version" value="0.7.4"/> ! <property name="build.dir" value="build/"/> ! <property name="dist.dir" value="dist"/> ! <property name="package.dir" value="${dist.dir}/${project.name}-${version}"/> ! <property name="bin.dir" value="${package.dir}/bin/"/> ! <property name="src.dir" value="${package.dir}/src/"/> <property name="doc.dir" value="${package.dir}/doc/" /> ! <property name="lib.dir" value="lib/"/> ! <property name="ext.dir" value="lib-ext"/> ! <property name="mbunit.dir" value="${ext.dir}/MbUnit-2.22"/> ! ! <tstamp/> ! <target name="debug" description="Perform a 'debug' build"> ! <property name="build.assemblyInfo" value="CommonAssemblyInfo.cs"/> ! </target> ! ! <target name="release" description="Perform a 'release' build"> ! <property name="build.assemblyInfo" value="StrongCommonAssemblyInfo.cs"/> ! </target> ! <target name="init" description="Setup environment"> ! <mkdir dir="${build.dir}" failonerror="false"/> <call target="${project.config}" /> </target> <target name="clean" description="Cleans project to pre-build state"> ! <delete dir="${dist.dir}" failonerror="false"/> ! <delete dir="${build.dir}" failonerror="false"/> </target> <target name="clean-all" description="Cleans all sub-projects to pre-build state" depends="clean"> <delete failonerror="false"> <fileset basedir="."> ! <includes name="**/bin"/> ! <includes name="**/obj"/> </fileset> </delete> --- 1,39 ---- ! <project name=".NET Mock Objects master build file" default="test" xmlns="http://nant.sf.net/schemas/nant.xsd"> <description>Master build file for .NET Mock Objects project</description> ! <property name="project.config" value="debug" /> ! <property name="debug.build" value="true" /> ! <property name="VisualStudioTemplates" value="VisualStudioTemplates" /> ! <property name="VisualStudioTemplates2003" value="VisualStudioTemplates2003" /> ! <property name="project.name" value="DotNetMock" /> ! <property name="version" value="0.7.4" /> ! <property name="build.dir" value="build/" /> ! <property name="dist.dir" value="dist" /> ! <property name="package.dir" value="${dist.dir}/${project.name}-${version}" /> ! <property name="bin.dir" value="${package.dir}/bin/" /> ! <property name="src.dir" value="${package.dir}/src/" /> <property name="doc.dir" value="${package.dir}/doc/" /> ! <property name="lib.dir" value="lib/" /> ! <property name="ext.dir" value="lib-ext" /> ! <property name="mbunit.dir" value="${ext.dir}/MbUnit-2.22" /> ! <tstamp /> <target name="debug" description="Perform a 'debug' build"> ! <property name="build.assemblyInfo" value="CommonAssemblyInfo.cs" /> ! </target> ! <target name="release" description="Perform a 'release' build"> ! <property name="build.assemblyInfo" value="StrongCommonAssemblyInfo.cs" /> ! </target> <target name="init" description="Setup environment"> ! <mkdir dir="${build.dir}" failonerror="false" /> <call target="${project.config}" /> </target> <target name="clean" description="Cleans project to pre-build state"> ! <delete dir="${dist.dir}" failonerror="false" /> ! <delete dir="${build.dir}" failonerror="false" /> </target> <target name="clean-all" description="Cleans all sub-projects to pre-build state" depends="clean"> <delete failonerror="false"> <fileset basedir="."> ! <include name="**/bin" /> ! <include name="**/obj" /> </fileset> </delete> *************** *** 45,57 **** <target name="test" depends="build" description="Runs NUnit tests for all built assemblies"> <nunit2> ! <formatter type="Plain"/> ! <test assemblyname="${build.dir}/DotNetMock.Tests.dll"/> ! <test assemblyname="${build.dir}/DotNetMock.TestFramework.Tests.dll"/> ! <test assemblyname="${build.dir}/DotNetMock.Framework.Tests.dll"/> ! <test assemblyname="${build.dir}/DotNetMock.Examples.NUnitTests.dll"/> </nunit2> </target> <target name="mbunit" depends="build"> ! <!-- cannot use MbUnit.Tasks because it requires NAnt 0.85 <loadtasks assembly="${mbunit.dir}/MbUnit.Tasks.dll"/> <mbunit --- 41,53 ---- <target name="test" depends="build" description="Runs NUnit tests for all built assemblies"> <nunit2> ! <formatter type="Plain" /> ! <test assemblyname="${build.dir}/DotNetMock.Tests.dll" /> ! <test assemblyname="${build.dir}/DotNetMock.TestFramework.Tests.dll" /> ! <test assemblyname="${build.dir}/DotNetMock.Framework.Tests.dll" /> ! <test assemblyname="${build.dir}/DotNetMock.Examples.NUnitTests.dll" /> </nunit2> </target> <target name="mbunit" depends="build"> ! <!-- cannot use MbUnit.Tasks because it requires NAnt 0.85 --> <loadtasks assembly="${mbunit.dir}/MbUnit.Tasks.dll"/> <mbunit *************** *** 61,72 **** > <assemblies basedir="${build.dir}"> ! <includes name="*.MbUnitTests.dll"/> </assemblies> </mbunit> ! --> ! <exec ! program="${mbunit.dir}/MbUnit.Cons.exe" ! workingdir="${build.dir}" ! > <arg value="/report-type:Text" /> <arg value="DotNetMock.Examples.MbUnitTests.dll" /> --- 57,64 ---- > <assemblies basedir="${build.dir}"> ! <include name="*.MbUnitTests.dll"/> </assemblies> </mbunit> ! <exec program="${mbunit.dir}/MbUnit.Cons.exe" workingdir="${build.dir}"> <arg value="/report-type:Text" /> <arg value="DotNetMock.Examples.MbUnitTests.dll" /> *************** *** 76,314 **** <csc target="library" output="${build.dir}/DotNetMock.dll" debug="${debug.build}" doc="${build.dir}\DotNetMock.xml"> <sources basedir="."> ! <includes name="${build.assemblyInfo}"/> ! <includes name="DotNetMock/**/*.cs"/> </sources> </csc> <csc target="library" output="${build.dir}/DotNetMock.Tests.dll" debug="${debug.build}"> <sources basedir="."> ! <includes name="DotNetMock.Tests/**/*.cs"/> </sources> <references basedir="."> ! <includes name="lib/nunit.framework.dll"/> ! <includes name="build/DotNetMock.dll"/> </references> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.Framework.dll" debug="${debug.build}" doc="${build.dir}\DotNetMock.Framework.xml"> <sources basedir="."> ! <includes name="${build.assemblyInfo}"/> ! <includes name="DotNetMock.Framework/**/*.cs"/> </sources> <references basedir="."> ! <includes name="build/DotNetMock.dll" /> </references> </csc> <csc target="library" output="${build.dir}/DotNetMock.Framework.Tests.dll" debug="${debug.build}"> <sources basedir="."> ! <includes name="DotNetMock.Framework.Tests/**/*.cs"/> </sources> <references basedir="."> ! <includes name="lib/nunit.framework.dll"/> ! <includes name="build/DotNetMock.dll"/> ! <includes name="build/DotNetMock.Framework.dll"/> </references> </csc> <csc target="library" output="${build.dir}/DotNetMock.Examples.dll" debug="${debug.build}"> <sources basedir="."> ! <includes name="DotNetMock.Examples/**/*.cs"/> </sources> <references basedir="."> ! <includes name="build/DotNetMock.dll"/> </references> </csc> <csc target="library" output="${build.dir}/DotNetMock.Examples.NUnitTests.dll" debug="${debug.build}"> <sources basedir="."> ! <includes name="DotNetMock.Examples.NUnitTests/**/*.cs"/> </sources> <references basedir="."> ! <includes name="build/DotNetMock.Examples.dll"/> ! <includes name="build/DotNetMock.dll"/> ! <includes name="build/DotNetMock.Framework.dll"/> ! <includes name="lib/nunit.framework.dll" /> </references> </csc> <csc target="library" output="${build.dir}/DotNetMock.TestFramework.Tests.dll" debug="${debug.build}"> <sources basedir="."> ! <includes name="DotNetMock.TestFramework.Tests/**/*.cs"/> </sources> <references basedir="."> ! <includes name="lib/nunit.framework.dll"/> ! <includes name="build/DotNetMock.dll"/> </references> </csc> <copy todir="${build.dir}"> <fileset basedir="${lib.dir}"> ! <includes name="*.dll"/> ! <excludes name="INterop.CorProfilingLib.dll" /> </fileset> </copy> <copy todir="${build.dir}"> <fileset basedir="${mbunit.dir}"> ! <includes name="*.dll"/> ! <excludes name="*.Tasks.dll" /> </fileset> </copy> <csc target="library" output="${build.dir}/DotNetMock.Examples.MbUnitTests.dll" debug="${debug.build}"> <sources basedir="."> ! <includes name="DotNetMock.Examples.MbUnitTests/**/*.cs"/> </sources> <references basedir="."> ! <includes name="build/DotNetMock.Examples.dll"/> ! <includes name="build/DotNetMock.dll"/> ! <includes name="build/DotNetMock.Framework.dll"/> ! <includes name="${mbunit.dir}/MbUnit.Core.dll" /> ! <includes name="${mbunit.dir}/MbUnit.Framework.dll" /> </references> </csc> </target> <target name="package" description="Collects and packs up the distribution" depends="buildMSDN"> ! <mkdir dir="${dist.dir}" failonerror="false"/> ! <mkdir dir="${package.dir}" failonerror="false"/> ! <mkdir dir="${bin.dir}" failonerror="false"/> ! <mkdir dir="${src.dir}" failonerror="false"/> ! <mkdir dir="${doc.dir}" failonerror="false"/> ! <mkdir dir="${VisualStudioTemplates}" failonerror="false"/> ! <mkdir dir="${VisualStudioTemplates2003}" failonerror="false"/> <copy todir="${bin.dir}"> <fileset basedir="${build.dir}"> ! <includes name="*.dll"/> </fileset> </copy> <copy todir="${bin.dir}"> <fileset basedir="${lib.dir}"> ! <includes name="*.dll"/> ! <excludes name="INterop.CorProfilingLib.dll" /> </fileset> </copy> ! <copy file="deployment/DotNetMock.build" tofile="${package.dir}/DotNetMock.build"/> <copy todir="${doc.dir}"> <fileset basedir="docs"> ! <includes name="**/*.*"/> </fileset> </copy> <copy todir="${src.dir}/DotNetMock"> <fileset basedir="DotNetMock"> ! <includes name="**/*.cs"/> </fileset> </copy> <copy todir="${src.dir}/DotNetMock.Tests"> <fileset basedir="DotNetMock.Tests"> ! <includes name="**/*.cs"/> </fileset> </copy> <copy todir="${src.dir}/DotNetMock.Framework"> <fileset basedir="DotNetMock.Framework"> ! <includes name="**/*.cs"/> </fileset> </copy> <copy todir="${src.dir}/DotNetMock.Framework.Tests"> <fileset basedir="DotNetMock.Framework.Tests"> ! <includes name="**/*.cs"/> </fileset> </copy> <copy todir="${src.dir}/DotNetMock.Examples"> <fileset basedir="DotNetMock.Examples"> ! <includes name="**/*.cs"/> </fileset> </copy> <copy todir="${package.dir}/${VisualStudioTemplates}"> <fileset basedir="${VisualStudioTemplates}"> ! <includes name="**/*"/> </fileset> </copy> <copy todir="${package.dir}/${VisualStudioTemplates2003}"> <fileset basedir="${VisualStudioTemplates2003}"> ! <includes name="**/*"/> </fileset> ! </copy> <copy todir="${doc.dir}"> <fileset basedir="./docs"> ! <includes name="**/*"/> </fileset> </copy> <zip zipfile="${dist.dir}/${project.name}-${version}.zip"> <fileset basedir="${package.dir}"> ! <includes name="**/*"/> </fileset> </zip> </target> <target name="buildMSDN" depends="test" description="build documentation"> ! <echo message="Requires HtmlHelp compiler (hhc.exe) to be in the system path"/> <ndoc failonerror="false"> <assemblies basedir="."> ! <includes name="build/DotNetMock.dll"/> ! <includes name="build/DotNetMock.Framework.dll"/> </assemblies> <documenters> <documenter name="MSDN"> ! <property name="OutputDirectory" value="${build.dir}/docs/MSDN"/> ! <property name="HtmlHelpName" value="DotNetMock"/> ! <property name="HtmlHelpCompilerFilename" value="hhc.exe"/> ! <property name="IncludeFavorites" value="False"/> ! <property name="Title" value="An .NET Mock Objects Documented Class Library"/> ! <property name="SplitTOCs" value="False"/> ! <property name="DefaulTOC" value=""/> ! <property name="ShowVisualBasic" value="False"/> ! <property name="ShowMissingSummaries" value="False"/> ! <property name="ShowMissingRemarks" value="False"/> ! <property name="ShowMissingParams" value="False"/> ! <property name="ShowMissingReturns" value="False"/> ! <property name="ShowMissingValues" value="False"/> ! <property name="DocumentInternals" value="False"/> ! <property name="DocumentProtected" value="True"/> ! <property name="DocumentPrivates" value="False"/> ! <property name="DocumentEmptyNamespaces" value="False"/> ! <property name="IncludeAssemblyVersion" value="True"/> ! <property name="CopyrightText" value=""/> ! <property name="CopyrightHref" value=""/> </documenter> </documenters> </ndoc> ! <copy file="${build.dir}/docs/MSDN/DotNetMock.chm" todir="${doc.dir}"/> </target> <target name="InstallTemplates" description="Installs VS.NET Templates for Mock Objects and NUnit Tests Under Code"> ! <readregistry property="wizards.dir" key="SOFTWARE\Microsoft\VisualStudio\7.0\Projects\{FAE04EC0-301F-11d3-BF4B-00C04F79EFBC}\WizardsTemplatesDir" hive="LocalMachine"/> ! <readregistry property="items.dir" key="SOFTWARE\Microsoft\VisualStudio\7.0\Projects\{FAE04EC0-301F-11d3-BF4B-00C04F79EFBC}\ItemTemplatesDir" hive="LocalMachine"/> <copy todir="${items.dir}"> <fileset basedir="${VisualStudioTemplates}/CSharpProjectItems"> ! <includes name="**/*.vsz"/> </fileset> </copy> <copy todir="${items.dir}/LocalProjectItems/Code"> <fileset basedir="${VisualStudioTemplates}/CSharpProjectItems/LocalProjectItems/Code"> ! <includes name="**/*.vsdir"/> </fileset> </copy> <copy todir="${wizards.dir}"> <fileset basedir="${VisualStudioTemplates}/VC#Wizards"> ! <includes name="**/*"/> </fileset> </copy> </target> <target name="InstallTemplates2003" description="Installs VS.NET 2003 Templates for Mock Objects and NUnit Tests Under Code"> ! <readregistry property="wizards.dir" key="SOFTWARE\Microsoft\VisualStudio\7.1\Projects\{FAE04EC0-301F-11d3-BF4B-00C04F79EFBC}\WizardsTemplatesDir" hive="LocalMachine"/> ! <readregistry property="items.dir" key="SOFTWARE\Microsoft\VisualStudio\7.1\Projects\{FAE04EC0-301F-11d3-BF4B-00C04F79EFBC}\ItemTemplatesDir" hive="LocalMachine"/> <copy todir="${items.dir}"> <fileset basedir="${VisualStudioTemplates2003}/CSharpProjectItems"> ! <includes name="**/*.vsz"/> </fileset> </copy> <copy todir="${items.dir}/LocalProjectItems/Code"> <fileset basedir="${VisualStudioTemplates2003}/CSharpProjectItems/LocalProjectItems/Code"> ! <includes name="**/*.vsdir"/> </fileset> </copy> <copy todir="${wizards.dir}"> <fileset basedir="${VisualStudioTemplates2003}/VC#Wizards"> ! <includes name="**/*"/> </fileset> </copy> </target> <target name="BuildProfilingAssembly" description="Creates an Interop Assembly for the .NET Profiling API"> ! <tlbimp typelib="lib/CorProfilingAPI/corprof.tlb" ! output="lib/Interop.CorProfilingLib.dll" ! keyfile="lib/Interop.CorProfilingLib.key" ! primary="true" ! unsafe="true" ! /> </target> <target name="RunFxCop" description="Runs FxCop on the DotNetMock assemblies" depends="build"> --- 68,307 ---- <csc target="library" output="${build.dir}/DotNetMock.dll" debug="${debug.build}" doc="${build.dir}\DotNetMock.xml"> <sources basedir="."> ! <include name="${build.assemblyInfo}" /> ! <include name="DotNetMock/**/*.cs" /> </sources> </csc> <csc target="library" output="${build.dir}/DotNetMock.Tests.dll" debug="${debug.build}"> <sources basedir="."> ! <include name="DotNetMock.Tests/**/*.cs" /> </sources> <references basedir="."> ! <include name="lib/nunit.framework.dll" /> ! <include name="build/DotNetMock.dll" /> </references> </csc> ! <csc target="library" output="${build.dir}/DotNetMock.Framework.dll" debug="${debug.build}" ! doc="${build.dir}\DotNetMock.Framework.xml"> <sources basedir="."> ! <include name="${build.assemblyInfo}" /> ! <include name="DotNetMock.Framework/**/*.cs" /> </sources> <references basedir="."> ! <include name="build/DotNetMock.dll" /> </references> </csc> <csc target="library" output="${build.dir}/DotNetMock.Framework.Tests.dll" debug="${debug.build}"> <sources basedir="."> ! <include name="DotNetMock.Framework.Tests/**/*.cs" /> </sources> <references basedir="."> ! <include name="lib/nunit.framework.dll" /> ! <include name="build/DotNetMock.dll" /> ! <include name="build/DotNetMock.Framework.dll" /> </references> </csc> <csc target="library" output="${build.dir}/DotNetMock.Examples.dll" debug="${debug.build}"> <sources basedir="."> ! <include name="DotNetMock.Examples/**/*.cs" /> </sources> <references basedir="."> ! <include name="build/DotNetMock.dll" /> </references> </csc> <csc target="library" output="${build.dir}/DotNetMock.Examples.NUnitTests.dll" debug="${debug.build}"> <sources basedir="."> ! <include name="DotNetMock.Examples.NUnitTests/**/*.cs" /> </sources> <references basedir="."> ! <include name="build/DotNetMock.Examples.dll" /> ! <include name="build/DotNetMock.dll" /> ! <include name="build/DotNetMock.Framework.dll" /> ! <include name="lib/nunit.framework.dll" /> </references> </csc> <csc target="library" output="${build.dir}/DotNetMock.TestFramework.Tests.dll" debug="${debug.build}"> <sources basedir="."> ! <include name="DotNetMock.TestFramework.Tests/**/*.cs" /> </sources> <references basedir="."> ! <include name="lib/nunit.framework.dll" /> ! <include name="build/DotNetMock.dll" /> </references> </csc> <copy todir="${build.dir}"> <fileset basedir="${lib.dir}"> ! <include name="*.dll" /> ! <exclude name="INterop.CorProfilingLib.dll" /> </fileset> </copy> <copy todir="${build.dir}"> <fileset basedir="${mbunit.dir}"> ! <include name="*.dll" /> ! <exclude name="*.Tasks.dll" /> </fileset> </copy> <csc target="library" output="${build.dir}/DotNetMock.Examples.MbUnitTests.dll" debug="${debug.build}"> <sources basedir="."> ! <include name="DotNetMock.Examples.MbUnitTests/**/*.cs" /> </sources> <references basedir="."> ! <include name="build/DotNetMock.Examples.dll" /> ! <include name="build/DotNetMock.dll" /> ! <include name="build/DotNetMock.Framework.dll" /> ! <include name="${mbunit.dir}/MbUnit.Core.dll" /> ! <include name="${mbunit.dir}/MbUnit.Framework.dll" /> </references> </csc> </target> <target name="package" description="Collects and packs up the distribution" depends="buildMSDN"> ! <mkdir dir="${dist.dir}" failonerror="false" /> ! <mkdir dir="${package.dir}" failonerror="false" /> ! <mkdir dir="${bin.dir}" failonerror="false" /> ! <mkdir dir="${src.dir}" failonerror="false" /> ! <mkdir dir="${doc.dir}" failonerror="false" /> ! <mkdir dir="${VisualStudioTemplates}" failonerror="false" /> ! <mkdir dir="${VisualStudioTemplates2003}" failonerror="false" /> <copy todir="${bin.dir}"> <fileset basedir="${build.dir}"> ! <include name="*.dll" /> </fileset> </copy> <copy todir="${bin.dir}"> <fileset basedir="${lib.dir}"> ! <include name="*.dll" /> ! <exclude name="INterop.CorProfilingLib.dll" /> </fileset> </copy> ! <copy file="deployment/DotNetMock.build" tofile="${package.dir}/DotNetMock.build" /> <copy todir="${doc.dir}"> <fileset basedir="docs"> ! <include name="**/*.*" /> </fileset> </copy> <copy todir="${src.dir}/DotNetMock"> <fileset basedir="DotNetMock"> ! <include name="**/*.cs" /> </fileset> </copy> <copy todir="${src.dir}/DotNetMock.Tests"> <fileset basedir="DotNetMock.Tests"> ! <include name="**/*.cs" /> </fileset> </copy> <copy todir="${src.dir}/DotNetMock.Framework"> <fileset basedir="DotNetMock.Framework"> ! <include name="**/*.cs" /> </fileset> </copy> <copy todir="${src.dir}/DotNetMock.Framework.Tests"> <fileset basedir="DotNetMock.Framework.Tests"> ! <include name="**/*.cs" /> </fileset> </copy> <copy todir="${src.dir}/DotNetMock.Examples"> <fileset basedir="DotNetMock.Examples"> ! <include name="**/*.cs" /> </fileset> </copy> <copy todir="${package.dir}/${VisualStudioTemplates}"> <fileset basedir="${VisualStudioTemplates}"> ! <include name="**/*" /> </fileset> </copy> <copy todir="${package.dir}/${VisualStudioTemplates2003}"> <fileset basedir="${VisualStudioTemplates2003}"> ! <include name="**/*" /> </fileset> ! </copy> <copy todir="${doc.dir}"> <fileset basedir="./docs"> ! <include name="**/*" /> </fileset> </copy> <zip zipfile="${dist.dir}/${project.name}-${version}.zip"> <fileset basedir="${package.dir}"> ! <include name="**/*" /> </fileset> </zip> </target> <target name="buildMSDN" depends="test" description="build documentation"> ! <echo message="Requires HtmlHelp compiler (hhc.exe) to be in the system path" /> <ndoc failonerror="false"> <assemblies basedir="."> ! <include name="build/DotNetMock.dll" /> ! <include name="build/DotNetMock.Framework.dll" /> </assemblies> <documenters> <documenter name="MSDN"> ! <property name="OutputDirectory" value="${build.dir}/docs/MSDN" /> ! <property name="HtmlHelpName" value="DotNetMock" /> ! <property name="HtmlHelpCompilerFilename" value="hhc.exe" /> ! <property name="IncludeFavorites" value="False" /> ! <property name="Title" value="An .NET Mock Objects Documented Class Library" /> ! <property name="SplitTOCs" value="False" /> ! <property name="DefaulTOC" value="" /> ! <property name="ShowVisualBasic" value="False" /> ! <property name="ShowMissingSummaries" value="False" /> ! <property name="ShowMissingRemarks" value="False" /> ! <property name="ShowMissingParams" value="False" /> ! <property name="ShowMissingReturns" value="False" /> ! <property name="ShowMissingValues" value="False" /> ! <property name="DocumentInternals" value="False" /> ! <property name="DocumentProtected" value="True" /> ! <property name="DocumentPrivates" value="False" /> ! <property name="DocumentEmptyNamespaces" value="False" /> ! <property name="IncludeAssemblyVersion" value="True" /> ! <property name="CopyrightText" value="" /> ! <property name="CopyrightHref" value="" /> </documenter> </documenters> </ndoc> ! <copy file="${build.dir}/docs/MSDN/DotNetMock.chm" todir="${doc.dir}" /> </target> <target name="InstallTemplates" description="Installs VS.NET Templates for Mock Objects and NUnit Tests Under Code"> ! <readregistry property="wizards.dir" key="SOFTWARE\Microsoft\VisualStudio\7.0\Projects\{FAE04EC0-301F-11d3-BF4B-00C04F79EFBC}\WizardsTemplatesDir" ! hive="LocalMachine" /> ! <readregistry property="items.dir" key="SOFTWARE\Microsoft\VisualStudio\7.0\Projects\{FAE04EC0-301F-11d3-BF4B-00C04F79EFBC}\ItemTemplatesDir" ! hive="LocalMachine" /> <copy todir="${items.dir}"> <fileset basedir="${VisualStudioTemplates}/CSharpProjectItems"> ! <include name="**/*.vsz" /> </fileset> </copy> <copy todir="${items.dir}/LocalProjectItems/Code"> <fileset basedir="${VisualStudioTemplates}/CSharpProjectItems/LocalProjectItems/Code"> ! <include name="**/*.vsdir" /> </fileset> </copy> <copy todir="${wizards.dir}"> <fileset basedir="${VisualStudioTemplates}/VC#Wizards"> ! <include name="**/*" /> </fileset> </copy> </target> <target name="InstallTemplates2003" description="Installs VS.NET 2003 Templates for Mock Objects and NUnit Tests Under Code"> ! <readregistry property="wizards.dir" key="SOFTWARE\Microsoft\VisualStudio\7.1\Projects\{FAE04EC0-301F-11d3-BF4B-00C04F79EFBC}\WizardsTemplatesDir" ! hive="LocalMachine" /> ! <readregistry property="items.dir" key="SOFTWARE\Microsoft\VisualStudio\7.1\Projects\{FAE04EC0-301F-11d3-BF4B-00C04F79EFBC}\ItemTemplatesDir" ! hive="LocalMachine" /> <copy todir="${items.dir}"> <fileset basedir="${VisualStudioTemplates2003}/CSharpProjectItems"> ! <include name="**/*.vsz" /> </fileset> </copy> <copy todir="${items.dir}/LocalProjectItems/Code"> <fileset basedir="${VisualStudioTemplates2003}/CSharpProjectItems/LocalProjectItems/Code"> ! <include name="**/*.vsdir" /> </fileset> </copy> <copy todir="${wizards.dir}"> <fileset basedir="${VisualStudioTemplates2003}/VC#Wizards"> ! <include name="**/*" /> </fileset> </copy> </target> <target name="BuildProfilingAssembly" description="Creates an Interop Assembly for the .NET Profiling API"> ! <tlbimp typelib="lib/CorProfilingAPI/corprof.tlb" output="lib/Interop.CorProfilingLib.dll" ! keyfile="lib/Interop.CorProfilingLib.key" primary="true" unsafe="true" /> </target> <target name="RunFxCop" description="Runs FxCop on the DotNetMock assemblies" depends="build"> *************** *** 317,369 **** </target> <target name="CloverInit" description="Initializes Clover.Net properties"> ! <echo message="Building with Clover"/> <!-- import system environment variables --> ! <sysinfo/> ! <property name="Clover.home" value="D:\dev_utils\Cenqua\Clover.NET"/> <copy todir="${Clover.home}" failonerror="false" overwrite="true"> <fileset basedir="."> ! <includes name="clovernet.license"/> </fileset> </copy> <!-- check to see if this user has specified any custom properties / property overrides --> ! <property name="user.overrides.file" value="${sys.os.folder.applicationdata}\Spring.NET.xml"/> <available type="File" resource="${user.overrides.file}" property="user.overrides.present" /> <!-- if he / she has, then include all of those custom properties / property overrides --> <if propertytrue="user.overrides.present"> ! <include buildfile="${user.overrides.file}" /> </if> ! ! <loadtasks assembly="${Clover.home}\CloverNant-0.84.dll"/> ! <clover-setup initstring="CloverBuild\clover.cdb" ! builddir="CloverBuild" ! enabled="true" ! flatten="true"> <fileset basedir="."> ! <includes name="DotNetMock/**/*"/> ! <includes name="DotNetMock.Framework/**/*"/> ! <excludes name="DotNetMock.Examples/**/*"/> ! <excludes name="DotNetMock.Framework.Tests/**/*"/> ! <excludes name="DotNetMock.Tests/**/*"/> ! </fileset> </clover-setup> </target> - <target name="CloverClean"> ! <delete dir="CloverBuild" failonerror="false" /> </target> - <target name="CloverTest" depends="CloverInit"> ! <call target="test" /> </target> ! ! <target name="CloverReport" depends="CloverTest" > ! <clover-report> ! <current title=".NET Mock Objects Code Coverage" output="report"> ! <format type="html"/> ! </current> ! </clover-report> </target> ! ! <target name="CloverAll" description="Convenience target to execute the full Clover build cycle." depends="CloverTest,CloverReport,CloverClean"/> ! </project> --- 310,354 ---- </target> <target name="CloverInit" description="Initializes Clover.Net properties"> ! <echo message="Building with Clover" /> <!-- import system environment variables --> ! <sysinfo /> ! <property name="Clover.home" value="D:\dev_utils\Cenqua\Clover.NET" /> <copy todir="${Clover.home}" failonerror="false" overwrite="true"> <fileset basedir="."> ! <include name="clovernet.license" /> </fileset> </copy> <!-- check to see if this user has specified any custom properties / property overrides --> ! <property name="user.overrides.file" value="${sys.os.folder.applicationdata}\DotNetMock.xml" /> <available type="File" resource="${user.overrides.file}" property="user.overrides.present" /> <!-- if he / she has, then include all of those custom properties / property overrides --> <if propertytrue="user.overrides.present"> ! <include buildfile="${user.overrides.file}" /> </if> ! <loadtasks assembly="${Clover.home}\CloverNant-0.85.dll" /> ! <clover-setup initstring="CloverBuild\clover.cdb" builddir="CloverBuild" enabled="true" flatten="true"> <fileset basedir="."> ! <include name="DotNetMock/**/*" /> ! <include name="DotNetMock.Framework/**/*" /> ! <exclude name="DotNetMock.Examples/**/*" /> ! <exclude name="DotNetMock.Framework.Tests/**/*" /> ! <exclude name="DotNetMock.Tests/**/*" /> ! </fileset> </clover-setup> </target> <target name="CloverClean"> ! <delete dir="CloverBuild" failonerror="false" /> </target> <target name="CloverTest" depends="CloverInit"> ! <call target="test" /> </target> ! <target name="CloverReport" depends="CloverTest"> ! <clover-report> ! <current title=".NET Mock Objects Code Coverage" output="report"> ! <format type="html" /> ! </current> ! </clover-report> </target> ! <target name="CloverAll" description="Convenience target to execute the full Clover build cycle." ! depends="CloverTest,CloverReport,CloverClean" /> </project> |
|
From: Griffin C. <gc...@us...> - 2005-02-12 18:10:46
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6085/DotNetMock.Tests Modified Files: AbstractIListExpectationTests.cs ExpectationArrayListTests.cs ExpectationArrayTests.cs ExpectationBoolTests.cs ExpectationCounterTests.cs ExpectationStringTests.cs ExpectationTypeTests.cs ExpectationValueTests.cs MockObjectTests.cs NullTests.cs ReturnValueTest.cs Log Message: - Upgraded Tests to use NUnit 2.2 Index: NullTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/NullTests.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NullTests.cs 5 Jan 2005 14:43:17 -0000 1.7 --- NullTests.cs 12 Feb 2005 18:10:36 -0000 1.8 *************** *** 24,39 **** [Test] public void NullObjectMethods() { ! Assertion.AssertEquals("null", _null.ToString()); _null.Name = "Null Object"; ! Assertion.AssertEquals("Null Object", _null.ToString()); NullObject null2 = new NullObject(); int int1 = 3; ! NUnit.Framework.Assertion.Assert(!_null.Equals(int1)); ! NUnit.Framework.Assertion.Assert(_null.Equals(null2)); } [Test] public void NullHashCode() { ! Assertion.AssertEquals("null".GetHashCode(), _null.GetHashCode()); } [Test] --- 24,39 ---- [Test] public void NullObjectMethods() { ! Assert.AreEqual("null", _null.ToString()); _null.Name = "Null Object"; ! Assert.AreEqual("Null Object", _null.ToString()); NullObject null2 = new NullObject(); int int1 = 3; ! Assert.IsTrue(!_null.Equals(int1)); ! Assert.IsTrue(_null.Equals(null2)); } [Test] public void NullHashCode() { ! Assert.AreEqual("null".GetHashCode(), _null.GetHashCode()); } [Test] Index: ExpectationArrayTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ExpectationArrayTests.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExpectationArrayTests.cs 10 Oct 2004 18:20:05 -0000 1.4 --- ExpectationArrayTests.cs 12 Feb 2005 18:10:36 -0000 1.5 *************** *** 1,5 **** - using System; using NUnit.Framework; - namespace DotNetMock.Tests { --- 1,3 ---- *************** *** 8,159 **** { private ExpectationArray _expectationArray = null; - [SetUp] ! public void Init() { _expectationArray = new ExpectationArray( "My Expectation Array" ); } [TearDown] ! public void Destroy() { _expectationArray = null; } [Test] ! public void Empty() { ! _expectationArray.Verify(); } [Test] ! public void HasExpectations() ! { ! NUnit.Framework.Assertion.Assert("Should not have expectations.", !_expectationArray.HasExpectations); ! _expectationArray.Expected = new object[] { "a" }; ! NUnit.Framework.Assertion.Assert("Should have expectations.", _expectationArray.HasExpectations); } [Test] ! public void HasExpectationsFromArray() { ! object[] objects = new object[] { "a", "b", "c" }; ! NUnit.Framework.Assertion.Assert("Should not have expectations.", !_expectationArray.HasExpectations); _expectationArray.Expected = objects; ! NUnit.Framework.Assertion.Assert("Should have expectations.", _expectationArray.HasExpectations); } [Test] ! public void HasNoExpectations() { ! _expectationArray.Expected = new object[] { "a" }; ! _expectationArray.ClearExpected(); ! NUnit.Framework.Assertion.Assert("Should not have expectations.", !_expectationArray.HasExpectations); } [Test] ! public void VerfyLotsOfAdds() { ! object[] objects1 = new object[] { 3, 4, 5 }; ! object[] objects2 = new object[] { 6, 7, 8 }; ! object[] objects3 = new object[] { 3, 4, 5 }; ! _expectationArray.Expected = objects2; _expectationArray.Actual = objects1; ! try { ! _expectationArray.Verify(); ! NUnit.Framework.Assertion.Fail("Should have thrown an exception."); } ! catch {} ! _expectationArray.ClearExpected(); _expectationArray.Expected = objects3; ! _expectationArray.Verify(); } [Test] ! [ExpectedException(typeof(DotNetMock.AssertionException))] ! public void FailImmediately() { ! _expectationArray.Expected = new object[] { "a", "b" }; _expectationArray.VerifyImmediate = true; ! _expectationArray.Actual = new object[] { "a", "c" }; } [Test] ! public void FlushExpected() { ! _expectationArray.Expected = new object[] { "a" }; ! NUnit.Framework.Assertion.Assert( " should have expectations", _expectationArray.HasExpectations ); ! _expectationArray.ExpectNothing(); ! NUnit.Framework.Assertion.Assert( " should have expectations", _expectationArray.HasExpectations ); ! _expectationArray.Actual = new object[] { "a" }; ! try { ! _expectationArray.Verify(); ! NUnit.Framework.Assertion.Fail( "Should have thrown an exception" ); ! } ! catch {} } [Test] ! [ExpectedException(typeof(DotNetMock.AssertionException))] ! public void FailingVerify() { ! _expectationArray.Expected = new object[] { "A", "B", "C" }; ! _expectationArray.Actual = new object[] { "A", "B", "B" }; ! _expectationArray.Verify(); } [Test] ! public void AddSingleItem() { int int1 = 2; ! ! _expectationArray.Expected = new object[] { int1 }; ! _expectationArray.Actual = new object[] { int1 }; ! _expectationArray.Verify(); } [Test] ! public void AddMany() { string[] array = new string[3]; ! array[0] = "A"; ! array[1] = "B"; ! array[2] = "C"; ! _expectationArray.Expected = array; _expectationArray.Actual = array; ! _expectationArray.Verify(); } [Test] ! [ExpectedException(typeof(DotNetMock.AssertionException))] ! public void StrictAdding() { _expectationArray.Strict = true; ! _expectationArray.Expected = new object[] { "a" }; ! _expectationArray.Actual = new object[] { "a", "b" }; ! _expectationArray.Verify(); } [Test] ! public void NoStrictAdding() { ! _expectationArray.Expected = new object[] { "a" }; ! _expectationArray.Actual = new object[] { "a", "b" }; ! _expectationArray.Verify(); } [Test] ! public void NullValuesBoth() { _expectationArray.Expected = null; _expectationArray.Actual = null; ! _expectationArray.Verify(); } [Test] ! [ExpectedException(typeof(DotNetMock.AssertionException))] ! public void NullValuesExpected() { _expectationArray.Expected = null; ! _expectationArray.Actual = new object[] { "a" }; ! _expectationArray.Verify(); } [Test] ! [ExpectedException(typeof(DotNetMock.AssertionException))] ! public void NullValuesActual() { ! _expectationArray.Expected = new object[] { "a" }; _expectationArray.Actual = null; ! _expectationArray.Verify(); } } ! } --- 6,157 ---- { private ExpectationArray _expectationArray = null; [SetUp] ! public void Init( ) { _expectationArray = new ExpectationArray( "My Expectation Array" ); } [TearDown] ! public void Destroy( ) { _expectationArray = null; } [Test] ! public void Empty( ) { ! _expectationArray.Verify( ); } [Test] ! public void HasExpectations( ) ! { ! Assert.IsTrue( !_expectationArray.HasExpectations, "Should not have expectations." ); ! _expectationArray.Expected = new object[] {"a"}; ! Assert.IsTrue( _expectationArray.HasExpectations, "Should have expectations." ); } [Test] ! public void HasExpectationsFromArray( ) { ! object[] objects = new object[] {"a", "b", "c"}; ! Assert.IsTrue( !_expectationArray.HasExpectations, "Should not have expectations." ); _expectationArray.Expected = objects; ! Assert.IsTrue( _expectationArray.HasExpectations, "Should have expectations." ); } [Test] ! public void HasNoExpectations( ) { ! _expectationArray.Expected = new object[] {"a"}; ! _expectationArray.ClearExpected( ); ! Assert.IsTrue( !_expectationArray.HasExpectations, "Should not have expectations." ); } [Test] ! public void VerfyLotsOfAdds( ) { ! object[] objects1 = new object[] {3, 4, 5}; ! object[] objects2 = new object[] {6, 7, 8}; ! object[] objects3 = new object[] {3, 4, 5}; _expectationArray.Expected = objects2; _expectationArray.Actual = objects1; ! try { ! _expectationArray.Verify( ); ! Assert.Fail( "Should have thrown an exception." ); } ! catch ! { ! } ! _expectationArray.ClearExpected( ); _expectationArray.Expected = objects3; ! _expectationArray.Verify( ); } [Test] ! [ExpectedException( typeof ( AssertionException ) )] ! public void FailImmediately( ) { ! _expectationArray.Expected = new object[] {"a", "b"}; _expectationArray.VerifyImmediate = true; ! _expectationArray.Actual = new object[] {"a", "c"}; } [Test] ! public void FlushExpected( ) { ! _expectationArray.Expected = new object[] {"a"}; ! Assert.IsTrue( _expectationArray.HasExpectations, " should have expectations" ); ! _expectationArray.ExpectNothing( ); ! Assert.IsTrue( _expectationArray.HasExpectations, " should have expectations" ); ! _expectationArray.Actual = new object[] {"a"}; ! try { ! _expectationArray.Verify( ); ! Assert.Fail( "Should have thrown an exception" ); ! } ! catch ! { ! } } [Test] ! [ExpectedException( typeof ( AssertionException ) )] ! public void FailingVerify( ) { ! _expectationArray.Expected = new object[] {"A", "B", "C"}; ! _expectationArray.Actual = new object[] {"A", "B", "B"}; ! _expectationArray.Verify( ); } [Test] ! public void AddSingleItem( ) { int int1 = 2; ! _expectationArray.Expected = new object[] {int1}; ! _expectationArray.Actual = new object[] {int1}; ! _expectationArray.Verify( ); } [Test] ! public void AddMany( ) { string[] array = new string[3]; ! array[ 0 ] = "A"; ! array[ 1 ] = "B"; ! array[ 2 ] = "C"; _expectationArray.Expected = array; _expectationArray.Actual = array; ! _expectationArray.Verify( ); } [Test] ! [ExpectedException( typeof ( AssertionException ) )] ! public void StrictAdding( ) { _expectationArray.Strict = true; ! _expectationArray.Expected = new object[] {"a"}; ! _expectationArray.Actual = new object[] {"a", "b"}; ! _expectationArray.Verify( ); } [Test] ! public void NoStrictAdding( ) { ! _expectationArray.Expected = new object[] {"a"}; ! _expectationArray.Actual = new object[] {"a", "b"}; ! _expectationArray.Verify( ); } [Test] ! public void NullValuesBoth( ) { _expectationArray.Expected = null; _expectationArray.Actual = null; ! _expectationArray.Verify( ); } [Test] ! [ExpectedException( typeof ( AssertionException ) )] ! public void NullValuesExpected( ) { _expectationArray.Expected = null; ! _expectationArray.Actual = new object[] {"a"}; ! _expectationArray.Verify( ); } [Test] ! [ExpectedException( typeof ( AssertionException ) )] ! public void NullValuesActual( ) { ! _expectationArray.Expected = new object[] {"a"}; _expectationArray.Actual = null; ! _expectationArray.Verify( ); } } ! } \ No newline at end of file Index: ExpectationArrayListTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ExpectationArrayListTests.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ExpectationArrayListTests.cs 10 Oct 2004 07:25:05 -0000 1.8 --- ExpectationArrayListTests.cs 12 Feb 2005 18:10:36 -0000 1.9 *************** *** 37,43 **** arrayList3.Add("A"); ! NUnit.Framework.Assertion.Assert("Should not have expectations.", !_expectationArrayList.HasExpectations); _expectationArrayList.AddExpectedMany(arrayList3); ! NUnit.Framework.Assertion.Assert("Should have expectations.", _expectationArrayList.HasExpectations); arrayList3 = null; --- 37,43 ---- arrayList3.Add("A"); ! Assert.IsTrue(!_expectationArrayList.HasExpectations, "Should not have expectations."); _expectationArrayList.AddExpectedMany(arrayList3); ! Assert.IsTrue(_expectationArrayList.HasExpectations, "Should have expectations."); arrayList3 = null; *************** *** 52,58 **** strings[2] = "C"; ! NUnit.Framework.Assertion.Assert(!_expectationArrayList.HasExpectations); _expectationArrayList.AddExpectedMany(strings); ! NUnit.Framework.Assertion.Assert(_expectationArrayList.HasExpectations); } --- 52,58 ---- strings[2] = "C"; ! Assert.IsTrue(!_expectationArrayList.HasExpectations); _expectationArrayList.AddExpectedMany(strings); ! Assert.IsTrue(_expectationArrayList.HasExpectations); } *************** *** 63,69 **** table.Add("mock", "objects"); ! NUnit.Framework.Assertion.Assert(!_expectationArrayList.HasExpectations); _expectationArrayList.AddExpectedMany(table); ! NUnit.Framework.Assertion.Assert(_expectationArrayList.HasExpectations); } --- 63,69 ---- table.Add("mock", "objects"); ! Assert.IsTrue(!_expectationArrayList.HasExpectations); _expectationArrayList.AddExpectedMany(table); ! Assert.IsTrue(_expectationArrayList.HasExpectations); } *************** *** 72,76 **** { _expectationArrayList.AddActual("A"); ! NUnit.Framework.Assertion.Assert(!_expectationArrayList.HasExpectations); } [Test] --- 72,76 ---- { _expectationArrayList.AddActual("A"); ! Assert.IsTrue(!_expectationArrayList.HasExpectations); } [Test] *************** *** 98,102 **** { _expectationArrayList.Verify(); ! NUnit.Framework.Assertion.Fail("Should have thrown an exception."); } catch --- 98,102 ---- { _expectationArrayList.Verify(); ! Assert.Fail("Should have thrown an exception."); } catch *************** *** 138,147 **** _expectationArrayList.AddExpected("A"); _expectationArrayList.ExpectNothing(); ! NUnit.Framework.Assertion.Assert( _expectationArrayList.HasExpectations ); _expectationArrayList.AddActual( "A" ); try { _expectationArrayList.Verify(); ! NUnit.Framework.Assertion.Fail( "Should have thrown an exception" ); } catch {} --- 138,147 ---- _expectationArrayList.AddExpected("A"); _expectationArrayList.ExpectNothing(); ! Assert.IsTrue( _expectationArrayList.HasExpectations ); _expectationArrayList.AddActual( "A" ); try { _expectationArrayList.Verify(); ! Assert.Fail( "Should have thrown an exception" ); } catch {} Index: AbstractIListExpectationTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/AbstractIListExpectationTests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AbstractIListExpectationTests.cs 5 Jan 2005 14:43:17 -0000 1.2 --- AbstractIListExpectationTests.cs 12 Feb 2005 18:10:36 -0000 1.3 *************** *** 67,71 **** { Verify(); ! Assertion.Fail( "should throw an exception." ); } catch {} --- 67,71 ---- { Verify(); ! Assert.Fail( "should throw an exception." ); } catch {} Index: ExpectationValueTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ExpectationValueTests.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ExpectationValueTests.cs 5 Jan 2005 14:43:17 -0000 1.8 --- ExpectationValueTests.cs 12 Feb 2005 18:10:36 -0000 1.9 *************** *** 24,30 **** Object object1 = new Object(); ! NUnit.Framework.Assertion.AssertNull(_expectationValue.Actual); _expectationValue.Actual = object1; ! NUnit.Framework.Assertion.AssertEquals(object1, _expectationValue.Actual); object1 = null; --- 24,30 ---- Object object1 = new Object(); ! Assert.IsNull(_expectationValue.Actual); _expectationValue.Actual = object1; ! Assert.AreEqual(object1, _expectationValue.Actual); object1 = null; *************** *** 35,41 **** Object object2 = new Object(); ! NUnit.Framework.Assertion.AssertNull(_expectationValue.Expected); _expectationValue.Expected = object2; ! NUnit.Framework.Assertion.AssertEquals(object2, _expectationValue.Expected); object2 = null; --- 35,41 ---- Object object2 = new Object(); ! Assert.IsNull(_expectationValue.Expected); _expectationValue.Expected = object2; ! Assert.AreEqual(object2, _expectationValue.Expected); object2 = null; *************** *** 47,51 **** _expectationValue.Expected = object3; ! NUnit.Framework.Assertion.Assert(_expectationValue.HasExpectations); object3 = null; --- 47,51 ---- _expectationValue.Expected = object3; ! Assert.IsTrue(_expectationValue.HasExpectations); object3 = null; *************** *** 76,83 **** _expectationValue.Expected = object4; ! NUnit.Framework.Assertion.Assert(_expectationValue.HasExpectations); ! NUnit.Framework.Assertion.Assert(!(_expectationValue.ShouldCheckImmediate)); _expectationValue.VerifyImmediate = true; ! NUnit.Framework.Assertion.Assert(_expectationValue.ShouldCheckImmediate); object4 = null; --- 76,83 ---- _expectationValue.Expected = object4; ! Assert.IsTrue(_expectationValue.HasExpectations); ! Assert.IsTrue(!(_expectationValue.ShouldCheckImmediate)); _expectationValue.VerifyImmediate = true; ! Assert.IsTrue(_expectationValue.ShouldCheckImmediate); object4 = null; *************** *** 89,97 **** Object object5 = new Object(); ! NUnit.Framework.Assertion.AssertNull(_expectationValue.Actual); _expectationValue.Actual = object5; ! NUnit.Framework.Assertion.AssertNotNull(_expectationValue.Actual); _expectationValue.ClearActual(); ! NUnit.Framework.Assertion.AssertNull(_expectationValue.Actual); object5 = null; --- 89,97 ---- Object object5 = new Object(); ! Assert.IsNull(_expectationValue.Actual); _expectationValue.Actual = object5; ! Assert.IsNotNull(_expectationValue.Actual); _expectationValue.ClearActual(); ! Assert.IsNull(_expectationValue.Actual); object5 = null; *************** *** 103,112 **** Object object6 = new Object(); ! NUnit.Framework.Assertion.AssertNull(_expectationValue.Expected); _expectationValue.Expected = object6; ! NUnit.Framework.Assertion.AssertNotNull(_expectationValue.Expected); ! NUnit.Framework.Assertion.Assert(_expectationValue.HasExpectations); _expectationValue.ClearExpected(); ! NUnit.Framework.Assertion.AssertNull(_expectationValue.Expected); object6 = null; --- 103,112 ---- Object object6 = new Object(); ! Assert.IsNull(_expectationValue.Expected); _expectationValue.Expected = object6; ! Assert.IsNotNull(_expectationValue.Expected); ! Assert.IsTrue(_expectationValue.HasExpectations); _expectationValue.ClearExpected(); ! Assert.IsNull(_expectationValue.Expected); object6 = null; Index: ExpectationStringTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ExpectationStringTests.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ExpectationStringTests.cs 5 Jan 2005 14:43:17 -0000 1.6 --- ExpectationStringTests.cs 12 Feb 2005 18:10:36 -0000 1.7 *************** *** 26,35 **** string test1 = "Mock Objects are Cool"; ! NUnit.Framework.Assertion.AssertNull(_expectationString.Actual); _expectationString.Actual = test1; ! NUnit.Framework.Assertion.AssertNotNull(_expectationString.Actual); ! NUnit.Framework.Assertion.AssertEquals(test1, _expectationString.Actual); _expectationString.ClearActual(); ! NUnit.Framework.Assertion.AssertNull(_expectationString.Actual); } --- 26,35 ---- string test1 = "Mock Objects are Cool"; ! Assert.IsNull(_expectationString.Actual); _expectationString.Actual = test1; ! Assert.IsNotNull(_expectationString.Actual); ! Assert.AreEqual(test1, _expectationString.Actual); _expectationString.ClearActual(); ! Assert.IsNull(_expectationString.Actual); } *************** *** 39,48 **** string test2 = "Unit Testing helps code."; ! NUnit.Framework.Assertion.AssertNull(_expectationString.Expected); _expectationString.Expected = test2; ! NUnit.Framework.Assertion.AssertNotNull(_expectationString.Expected); ! NUnit.Framework.Assertion.AssertEquals(test2, _expectationString.Expected); _expectationString.ClearExpected(); ! NUnit.Framework.Assertion.AssertNull(_expectationString.Expected); } --- 39,48 ---- string test2 = "Unit Testing helps code."; ! Assert.IsNull(_expectationString.Expected); _expectationString.Expected = test2; ! Assert.IsNotNull(_expectationString.Expected); ! Assert.AreEqual(test2, _expectationString.Expected); _expectationString.ClearExpected(); ! Assert.IsNull(_expectationString.Expected); } *************** *** 52,60 **** string test3 = "Sourceforge is nice."; ! NUnit.Framework.Assertion.AssertNull(_expectationString.Expected); _expectationString.Expected = test3; ! NUnit.Framework.Assertion.AssertNotNull(_expectationString.Expected); ! NUnit.Framework.Assertion.AssertEquals(test3, _expectationString.Expected); ! NUnit.Framework.Assertion.Assert(_expectationString.HasExpectations); test3 = null; --- 52,60 ---- string test3 = "Sourceforge is nice."; ! Assert.IsNull(_expectationString.Expected); _expectationString.Expected = test3; ! Assert.IsNotNull(_expectationString.Expected); ! Assert.AreEqual(test3, _expectationString.Expected); ! Assert.IsTrue(_expectationString.HasExpectations); test3 = null; *************** *** 94,101 **** _expectationString.Expected = test7; ! NUnit.Framework.Assertion.Assert(_expectationString.HasExpectations); ! NUnit.Framework.Assertion.Assert(!(_expectationString.ShouldCheckImmediate)); _expectationString.VerifyImmediate = true; ! NUnit.Framework.Assertion.Assert(_expectationString.ShouldCheckImmediate); test7 = null; --- 94,101 ---- _expectationString.Expected = test7; ! Assert.IsTrue(_expectationString.HasExpectations); ! Assert.IsTrue(!(_expectationString.ShouldCheckImmediate)); _expectationString.VerifyImmediate = true; ! Assert.IsTrue(_expectationString.ShouldCheckImmediate); test7 = null; *************** *** 107,115 **** string test8 = "Testing"; ! NUnit.Framework.Assertion.AssertNull(_expectationString.Actual); _expectationString.Actual = test8; ! NUnit.Framework.Assertion.AssertNotNull(_expectationString.Actual); _expectationString.ClearActual(); ! NUnit.Framework.Assertion.AssertNull(_expectationString.Actual); test8 = null; --- 107,115 ---- string test8 = "Testing"; ! Assert.IsNull(_expectationString.Actual); _expectationString.Actual = test8; ! Assert.IsNotNull(_expectationString.Actual); _expectationString.ClearActual(); ! Assert.IsNull(_expectationString.Actual); test8 = null; *************** *** 121,129 **** string test9 = "Testing"; ! NUnit.Framework.Assertion.AssertNull(_expectationString.Expected); _expectationString.Expected = test9; ! NUnit.Framework.Assertion.AssertNotNull(_expectationString.Expected); _expectationString.ClearExpected(); ! NUnit.Framework.Assertion.AssertNull(_expectationString.Expected); test9 = null; --- 121,129 ---- string test9 = "Testing"; ! Assert.IsNull(_expectationString.Expected); _expectationString.Expected = test9; ! Assert.IsNotNull(_expectationString.Expected); _expectationString.ClearExpected(); ! Assert.IsNull(_expectationString.Expected); test9 = null; Index: ExpectationTypeTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ExpectationTypeTests.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ExpectationTypeTests.cs 5 Jan 2005 14:43:17 -0000 1.6 --- ExpectationTypeTests.cs 12 Feb 2005 18:10:36 -0000 1.7 *************** *** 30,36 **** Type type1 = typeof(string); ! NUnit.Framework.Assertion.AssertNull(_expectationType.Actual); _expectationType.Actual = type1; ! NUnit.Framework.Assertion.AssertEquals(type1, _expectationType.Actual); type1 = null; --- 30,36 ---- Type type1 = typeof(string); ! Assert.IsNull(_expectationType.Actual); _expectationType.Actual = type1; ! Assert.AreEqual(type1, _expectationType.Actual); type1 = null; *************** *** 42,48 **** Type type2 = typeof(int); ! NUnit.Framework.Assertion.AssertNull(_expectationType.Expected); _expectationType.Expected = type2; ! NUnit.Framework.Assertion.AssertEquals(type2, _expectationType.Expected); type2 = null; --- 42,48 ---- Type type2 = typeof(int); ! Assert.IsNull(_expectationType.Expected); _expectationType.Expected = type2; ! Assert.AreEqual(type2, _expectationType.Expected); type2 = null; *************** *** 55,59 **** _expectationType.Expected = type3; ! NUnit.Framework.Assertion.Assert(_expectationType.HasExpectations); type3 = null; --- 55,59 ---- _expectationType.Expected = type3; ! Assert.IsTrue(_expectationType.HasExpectations); type3 = null; *************** *** 85,92 **** _expectationType.Expected = type4; ! NUnit.Framework.Assertion.Assert(_expectationType.HasExpectations); ! NUnit.Framework.Assertion.Assert(!(_expectationType.ShouldCheckImmediate)); _expectationType.VerifyImmediate = true; ! NUnit.Framework.Assertion.Assert(_expectationType.ShouldCheckImmediate); type4 = null; --- 85,92 ---- _expectationType.Expected = type4; ! Assert.IsTrue(_expectationType.HasExpectations); ! Assert.IsTrue(!(_expectationType.ShouldCheckImmediate)); _expectationType.VerifyImmediate = true; ! Assert.IsTrue(_expectationType.ShouldCheckImmediate); type4 = null; *************** *** 98,106 **** Type type5 = typeof(string); ! NUnit.Framework.Assertion.AssertNull(_expectationType.Actual); _expectationType.Actual = type5; ! NUnit.Framework.Assertion.AssertNotNull(_expectationType.Actual); _expectationType.ClearActual(); ! NUnit.Framework.Assertion.AssertNull(_expectationType.Actual); type5 = null; --- 98,106 ---- Type type5 = typeof(string); ! Assert.IsNull(_expectationType.Actual); _expectationType.Actual = type5; ! Assert.IsNotNull(_expectationType.Actual); _expectationType.ClearActual(); ! Assert.IsNull(_expectationType.Actual); type5 = null; *************** *** 112,121 **** Type type6 = typeof(string); ! NUnit.Framework.Assertion.AssertNull(_expectationType.Expected); _expectationType.Expected = type6; ! NUnit.Framework.Assertion.AssertNotNull(_expectationType.Expected); ! NUnit.Framework.Assertion.Assert(_expectationType.HasExpectations); _expectationType.ClearExpected(); ! NUnit.Framework.Assertion.AssertNull(_expectationType.Expected); type6 = null; --- 112,121 ---- Type type6 = typeof(string); ! Assert.IsNull(_expectationType.Expected); _expectationType.Expected = type6; ! Assert.IsNotNull(_expectationType.Expected); ! Assert.IsTrue(_expectationType.HasExpectations); _expectationType.ClearExpected(); ! Assert.IsNull(_expectationType.Expected); type6 = null; Index: ExpectationBoolTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ExpectationBoolTests.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ExpectationBoolTests.cs 5 Jan 2005 14:43:17 -0000 1.5 --- ExpectationBoolTests.cs 12 Feb 2005 18:10:36 -0000 1.6 *************** *** 26,34 **** public void SetActual() { ! NUnit.Framework.Assertion.Assert(!_expectationBool.Actual); _expectationBool.Actual = true; ! NUnit.Framework.Assertion.Assert(_expectationBool.Actual); _expectationBool.ClearActual(); ! NUnit.Framework.Assertion.Assert(!_expectationBool.Actual); } --- 26,34 ---- public void SetActual() { ! Assert.IsTrue(!_expectationBool.Actual); _expectationBool.Actual = true; ! Assert.IsTrue(_expectationBool.Actual); _expectationBool.ClearActual(); ! Assert.IsTrue(!_expectationBool.Actual); } *************** *** 36,44 **** public void SetExpected() { ! NUnit.Framework.Assertion.Assert(!_expectationBool.Expected); _expectationBool.Expected = true; ! NUnit.Framework.Assertion.Assert(_expectationBool.Expected); _expectationBool.ClearExpected(); ! NUnit.Framework.Assertion.Assert(!_expectationBool.Expected); } --- 36,44 ---- public void SetExpected() { ! Assert.IsTrue(!_expectationBool.Expected); _expectationBool.Expected = true; ! Assert.IsTrue(_expectationBool.Expected); _expectationBool.ClearExpected(); ! Assert.IsTrue(!_expectationBool.Expected); } *************** *** 46,55 **** public void HasExpectations() { ! NUnit.Framework.Assertion.Assert(!_expectationBool.Expected); _expectationBool.Expected = true; ! NUnit.Framework.Assertion.Assert(_expectationBool.Expected); ! NUnit.Framework.Assertion.Assert(_expectationBool.HasExpectations); _expectationBool.ClearExpected(); ! NUnit.Framework.Assertion.Assert(!_expectationBool.HasExpectations); } --- 46,55 ---- public void HasExpectations() { ! Assert.IsTrue(!_expectationBool.Expected); _expectationBool.Expected = true; ! Assert.IsTrue(_expectationBool.Expected); ! Assert.IsTrue(_expectationBool.HasExpectations); _expectationBool.ClearExpected(); ! Assert.IsTrue(!_expectationBool.HasExpectations); } *************** *** 63,67 **** { _expectationBool.Verify(); ! NUnit.Framework.Assertion.Fail("Should have thrown an exception."); } catch --- 63,67 ---- { _expectationBool.Verify(); ! Assert.Fail("Should have thrown an exception."); } catch *************** *** 77,84 **** _expectationBool.Expected = true; ! NUnit.Framework.Assertion.Assert(_expectationBool.HasExpectations); ! NUnit.Framework.Assertion.Assert(!(_expectationBool.ShouldCheckImmediate)); _expectationBool.VerifyImmediate = true; ! NUnit.Framework.Assertion.Assert(_expectationBool.ShouldCheckImmediate); } --- 77,84 ---- _expectationBool.Expected = true; ! Assert.IsTrue(_expectationBool.HasExpectations); ! Assert.IsTrue(!(_expectationBool.ShouldCheckImmediate)); _expectationBool.VerifyImmediate = true; ! Assert.IsTrue(_expectationBool.ShouldCheckImmediate); } *************** *** 86,94 **** public void ClearActual() { ! NUnit.Framework.Assertion.Assert(!_expectationBool.Actual); _expectationBool.Actual = true; ! NUnit.Framework.Assertion.Assert(_expectationBool.Actual); _expectationBool.ClearActual(); ! NUnit.Framework.Assertion.Assert(!_expectationBool.Actual); } --- 86,94 ---- public void ClearActual() { ! Assert.IsTrue(!_expectationBool.Actual); _expectationBool.Actual = true; ! Assert.IsTrue(_expectationBool.Actual); _expectationBool.ClearActual(); ! Assert.IsTrue(!_expectationBool.Actual); } *************** *** 96,104 **** public void ClearExpected() { ! NUnit.Framework.Assertion.Assert(!_expectationBool.Expected); _expectationBool.Expected = true; ! NUnit.Framework.Assertion.Assert(_expectationBool.Expected); _expectationBool.ClearExpected(); ! NUnit.Framework.Assertion.Assert(!_expectationBool.Expected); } [Test] --- 96,104 ---- public void ClearExpected() { ! Assert.IsTrue(!_expectationBool.Expected); _expectationBool.Expected = true; ! Assert.IsTrue(_expectationBool.Expected); _expectationBool.ClearExpected(); ! Assert.IsTrue(!_expectationBool.Expected); } [Test] Index: ExpectationCounterTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ExpectationCounterTests.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ExpectationCounterTests.cs 5 Jan 2005 14:43:17 -0000 1.9 --- ExpectationCounterTests.cs 12 Feb 2005 18:10:36 -0000 1.10 *************** *** 24,28 **** _counter.ExpectNothing(); ! Assertion.Assert("Has expectation", _counter.HasExpectations); _counter.Verify(); } --- 24,28 ---- _counter.ExpectNothing(); ! Assert.IsTrue( _counter.HasExpectations, "Has expectation"); _counter.Verify(); } *************** *** 35,39 **** _counter.VerifyImmediate = true; ! Assertion.Assert("Has expectation", _counter.HasExpectations); _counter.Inc(); } --- 35,39 ---- _counter.VerifyImmediate = true; ! Assert.IsTrue( _counter.HasExpectations, "Has expectation"); _counter.Inc(); } *************** *** 108,112 **** { _counter.Inc(); ! Assertion.Assert("Should have no expectations", !_counter.HasExpectations); _counter.Verify(); } --- 108,112 ---- { _counter.Inc(); ! Assert.IsTrue( !_counter.HasExpectations, "Should have no expectations"); _counter.Verify(); } Index: MockObjectTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/MockObjectTests.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MockObjectTests.cs 9 Oct 2004 21:14:12 -0000 1.8 --- MockObjectTests.cs 12 Feb 2005 18:10:36 -0000 1.9 *************** *** 31,37 **** public void MockVerified() { ! Assertion.Assert( !_mockObject.IsVerified ); _mockObject.Verify(); ! Assertion.Assert( _mockObject.IsVerified ); } } --- 31,37 ---- public void MockVerified() { ! Assert.IsTrue( !_mockObject.IsVerified ); _mockObject.Verify(); ! Assert.IsTrue( _mockObject.IsVerified ); } } Index: ReturnValueTest.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ReturnValueTest.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ReturnValueTest.cs 9 Oct 2004 21:14:12 -0000 1.6 --- ReturnValueTest.cs 12 Feb 2005 18:10:36 -0000 1.7 *************** *** 23,28 **** r.Add("B"); ! Assertion.AssertEquals("A", r.Next()); ! Assertion.AssertEquals("B", r.Next()); } --- 23,28 ---- r.Add("B"); ! Assert.AreEqual("A", r.Next()); ! Assert.AreEqual("B", r.Next()); } *************** *** 34,42 **** r.Add("B"); ! Assertion.AssertEquals("A", r.Next()); ! Assertion.AssertEquals("B", r.Next()); ! Assertion.AssertEquals("B", r.Next()); ! Assertion.AssertEquals("B", r.Next()); ! Assertion.AssertEquals("B", r.Next()); } --- 34,42 ---- r.Add("B"); ! Assert.AreEqual("A", r.Next()); ! Assert.AreEqual("B", r.Next()); ! Assert.AreEqual("B", r.Next()); ! Assert.AreEqual("B", r.Next()); ! Assert.AreEqual("B", r.Next()); } *************** *** 48,53 **** r.Add("B"); ! Assertion.AssertEquals("A", r.Next()); ! Assertion.AssertEquals("B", r.Next()); r.Next(); } --- 48,53 ---- r.Add("B"); ! Assert.AreEqual("A", r.Next()); ! Assert.AreEqual("B", r.Next()); r.Next(); } *************** *** 63,69 **** r.AddCollection(args); ! Assertion.AssertEquals("A", r.Next()); ! Assertion.AssertEquals("B", r.Next()); ! Assertion.AssertEquals("C", r.Next()); } --- 63,69 ---- r.AddCollection(args); ! Assert.AreEqual("A", r.Next()); ! Assert.AreEqual("B", r.Next()); ! Assert.AreEqual("C", r.Next()); } *************** *** 75,79 **** r.Add(new SystemException("Deliberate exception")); ! Assertion.AssertEquals("A", r.Next()); r.Next(); } --- 75,79 ---- r.Add(new SystemException("Deliberate exception")); ! Assert.AreEqual("A", r.Next()); r.Next(); } |
|
From: Griffin C. <gc...@us...> - 2005-02-12 18:10:45
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/Generate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6085/DotNetMock.Tests/Dynamic/Generate Modified Files: ClassGeneratorTests.cs Log Message: - Upgraded Tests to use NUnit 2.2 Index: ClassGeneratorTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/Generate/ClassGeneratorTests.cs,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ClassGeneratorTests.cs 5 Jan 2005 14:10:33 -0000 1.15 --- ClassGeneratorTests.cs 12 Feb 2005 18:10:36 -0000 1.16 *************** *** 200,204 **** mock.ExpectAndReturn("simpleReturn", x); object result = thingy.simpleReturn(); ! Assertion.AssertEquals(x, result); mock.Verify(); } --- 200,204 ---- mock.ExpectAndReturn("simpleReturn", x); object result = thingy.simpleReturn(); ! Assert.AreEqual(x, result); mock.Verify(); } *************** *** 210,214 **** mock.ExpectAndReturn("stringReturn", x); string result = thingy.stringReturn(); ! Assertion.AssertEquals(x, result); mock.Verify(); } --- 210,214 ---- mock.ExpectAndReturn("stringReturn", x); string result = thingy.stringReturn(); ! Assert.AreEqual(x, result); mock.Verify(); } *************** *** 220,224 **** mock.ExpectAndReturn("AThingy", t); IThingy result = thingy.AThingy(); ! Assertion.AssertEquals(thingy, result); mock.Verify(); } --- 220,224 ---- mock.ExpectAndReturn("AThingy", t); IThingy result = thingy.AThingy(); ! Assert.AreEqual(thingy, result); mock.Verify(); } *************** *** 229,233 **** mock.ExpectAndReturn("intReturn", 7); int result = thingy.intReturn(); ! Assertion.AssertEquals(7, result); mock.Verify(); } --- 229,233 ---- mock.ExpectAndReturn("intReturn", 7); int result = thingy.intReturn(); ! Assert.AreEqual(7, result); mock.Verify(); } *************** *** 238,243 **** mock.ExpectAndReturn("boolReturn", true); mock.ExpectAndReturn("doubleReturn", 1234567891234E+10); ! Assertion.Assert(thingy.boolReturn()); ! Assertion.AssertEquals(1234567891234E+10, thingy.doubleReturn()); mock.Verify(); } --- 238,243 ---- mock.ExpectAndReturn("boolReturn", true); mock.ExpectAndReturn("doubleReturn", 1234567891234E+10); ! Assert.IsTrue(thingy.boolReturn()); ! Assert.AreEqual(1234567891234E+10, thingy.doubleReturn()); mock.Verify(); } *************** *** 315,320 **** mock.ExpectAndReturn("ReadProperty", "hello"); mock.ExpectAndReturn("ReadProperty", "world"); ! Assertion.AssertEquals("hello", thingy.ReadProperty); ! Assertion.AssertEquals("world", thingy.ReadProperty); mock.Verify(); } --- 315,320 ---- mock.ExpectAndReturn("ReadProperty", "hello"); mock.ExpectAndReturn("ReadProperty", "world"); ! Assert.AreEqual("hello", thingy.ReadProperty); ! Assert.AreEqual("world", thingy.ReadProperty); mock.Verify(); } *************** *** 339,344 **** thingy.AProperty = "hello"; thingy.AProperty = "world"; ! Assertion.AssertEquals("good", thingy.AProperty); ! Assertion.AssertEquals("bye", thingy.AProperty); mock.Verify(); } --- 339,344 ---- thingy.AProperty = "hello"; thingy.AProperty = "world"; ! Assert.AreEqual("good", thingy.AProperty); ! Assert.AreEqual("bye", thingy.AProperty); mock.Verify(); } *************** *** 354,363 **** mock.ExpectAndReturn("GetHashCode", 123); mock.ExpectAndReturn("AbstractMethod", "fish"); ! Assertion.AssertEquals("hello", s.VirtualMethod()); ! Assertion.AssertEquals("STRING", s.ToString()); ! Assertion.AssertEquals(123, s.GetHashCode()); ! Assertion.AssertEquals("fish", s.AbstractMethod()); ! Assertion.AssertEquals("xx", s.NonVirtualMethod()); mock.Verify(); } --- 354,363 ---- mock.ExpectAndReturn("GetHashCode", 123); mock.ExpectAndReturn("AbstractMethod", "fish"); ! Assert.AreEqual("hello", s.VirtualMethod()); ! Assert.AreEqual("STRING", s.ToString()); ! Assert.AreEqual(123, s.GetHashCode()); ! Assert.AreEqual("fish", s.AbstractMethod()); ! Assert.AreEqual("xx", s.NonVirtualMethod()); mock.Verify(); } *************** *** 407,411 **** mock.Verify(); ! Assertion.AssertEquals(guid, returnedGuid); } } --- 407,411 ---- mock.Verify(); ! Assert.AreEqual(guid, returnedGuid); } } |
|
From: Griffin C. <gc...@us...> - 2005-02-12 18:10:45
|
Update of /cvsroot/dotnetmock/dotnetmock/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6085/lib Modified Files: nunit.framework.dll Log Message: - Upgraded Tests to use NUnit 2.2 Index: nunit.framework.dll =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/lib/nunit.framework.dll,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsNTvI5n and /tmp/cvsw6xsYF differ |
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6085/DotNetMock.Tests/Dynamic Modified Files: AbstractDynamicMockTests.cs DynamicMockTests.cs DynamicOrderedMockTests.cs ExpectationMethodTests.cs PredicateTests.cs Log Message: - Upgraded Tests to use NUnit 2.2 Index: DynamicOrderedMockTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/DynamicOrderedMockTests.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DynamicOrderedMockTests.cs 9 Jan 2005 21:05:06 -0000 1.6 --- DynamicOrderedMockTests.cs 12 Feb 2005 18:10:36 -0000 1.7 *************** *** 46,50 **** IDynamicMock mock = new CustomMock(typeof(IBlah)); IBlah blah = (IBlah)mock.Object; ! Assertion.AssertEquals("CUSTOM", blah.DoStuff("hello")); mock.Verify(); } --- 46,50 ---- IDynamicMock mock = new CustomMock(typeof(IBlah)); IBlah blah = (IBlah)mock.Object; ! Assert.AreEqual("CUSTOM", blah.DoStuff("hello")); mock.Verify(); } Index: ExpectationMethodTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/ExpectationMethodTests.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ExpectationMethodTests.cs 9 Oct 2004 21:14:12 -0000 1.5 --- ExpectationMethodTests.cs 12 Feb 2005 18:10:36 -0000 1.6 *************** *** 33,37 **** _expectedMethod = new ExpectationMethod( "myMethod", true ); _expectedMethod.Call("myMethod"); ! Assertion.Assert((bool)_expectedMethod.ReturnValue); _expectedMethod.Verify(); } --- 33,37 ---- _expectedMethod = new ExpectationMethod( "myMethod", true ); _expectedMethod.Call("myMethod"); ! Assert.IsTrue((bool)_expectedMethod.ReturnValue); _expectedMethod.Verify(); } Index: DynamicMockTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/DynamicMockTests.cs,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** DynamicMockTests.cs 9 Jan 2005 21:05:05 -0000 1.18 --- DynamicMockTests.cs 12 Feb 2005 18:10:36 -0000 1.19 *************** *** 58,62 **** mock.ExpectAndReturn("DoStuff", "world", "hello"); ! Assertion.AssertEquals("world", blah.DoStuff("hello")); blah.DoStuffWithParams("ID", "P1", "P2"); mock.Verify(); --- 58,62 ---- mock.ExpectAndReturn("DoStuff", "world", "hello"); ! Assert.AreEqual("world", blah.DoStuff("hello")); blah.DoStuffWithParams("ID", "P1", "P2"); mock.Verify(); *************** *** 68,72 **** IDynamicMock mock = new CustomMock(typeof(IBlah)); IBlah blah = (IBlah)mock.Object; ! Assertion.AssertEquals("CUSTOM", blah.DoStuff("hello")); mock.Verify(); } --- 68,72 ---- IDynamicMock mock = new CustomMock(typeof(IBlah)); IBlah blah = (IBlah)mock.Object; ! Assert.AreEqual("CUSTOM", blah.DoStuff("hello")); mock.Verify(); } Index: PredicateTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/PredicateTests.cs,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PredicateTests.cs 5 Jan 2005 14:19:44 -0000 1.11 --- PredicateTests.cs 12 Feb 2005 18:10:36 -0000 1.12 *************** *** 16,24 **** { p = new IsNull(); ! Assertion.Assert(p.Eval(null)); ! Assertion.Assert(!p.Eval(new object())); ! Assertion.Assert(!p.Eval(1)); ! Assertion.Assert(!p.Eval(true)); ! Assertion.Assert(!p.Eval(false)); } --- 16,24 ---- { p = new IsNull(); ! Assert.IsTrue(p.Eval(null)); ! Assert.IsTrue(!p.Eval(new object())); ! Assert.IsTrue(!p.Eval(1)); ! Assert.IsTrue(!p.Eval(true)); ! Assert.IsTrue(!p.Eval(false)); } *************** *** 27,32 **** { p = new NotNull(); ! Assertion.Assert(!p.Eval(null)); ! Assertion.Assert(p.Eval(new object())); } --- 27,32 ---- { p = new NotNull(); ! Assert.IsTrue(!p.Eval(null)); ! Assert.IsTrue(p.Eval(new object())); } *************** *** 37,55 **** object o2 = new object(); p = new IsEqual(o1); ! Assertion.Assert(p.Eval(o1)); ! Assertion.Assert(!p.Eval(o2)); ! Assertion.Assert(!p.Eval(null)); int i1 = 1; int i2 = 2; p = new IsEqual(i1); ! Assertion.Assert(p.Eval(i1)); ! Assertion.Assert(p.Eval(1)); ! Assertion.Assert(!p.Eval(i2)); ! Assertion.Assert(!p.Eval(2)); p = new IsEqual( null ); ! Assertion.Assert( !p.Eval( "something" ) ); ! Assertion.Assert( p.Eval( null ) ); } [Test] --- 37,55 ---- object o2 = new object(); p = new IsEqual(o1); ! Assert.IsTrue(p.Eval(o1)); ! Assert.IsTrue(!p.Eval(o2)); ! Assert.IsTrue(!p.Eval(null)); int i1 = 1; int i2 = 2; p = new IsEqual(i1); ! Assert.IsTrue(p.Eval(i1)); ! Assert.IsTrue(p.Eval(1)); ! Assert.IsTrue(!p.Eval(i2)); ! Assert.IsTrue(!p.Eval(2)); p = new IsEqual( null ); ! Assert.IsTrue( !p.Eval( "something" ) ); ! Assert.IsTrue( p.Eval( null ) ); } [Test] *************** *** 59,69 **** object[] array2 = new object[] { 1 }; p = new IsEqual( array1 ); ! Assertion.Assert( !p.Eval( "hello" ) ); ! Assertion.Assert( !p.Eval( null ) ); ! Assertion.Assert( !p.Eval( new object[] { 2, 3 } ) ); ! Assertion.Assert( !p.Eval( new object[] {} ) ); ! Assertion.Assert( !p.Eval( new object[] { 2 } ) ); ! Assertion.Assert( p.Eval( array1 ) ); ! Assertion.Assert( p.Eval( new object[] { 1 } ) ); } --- 59,69 ---- object[] array2 = new object[] { 1 }; p = new IsEqual( array1 ); ! Assert.IsTrue( !p.Eval( "hello" ) ); ! Assert.IsTrue( !p.Eval( null ) ); ! Assert.IsTrue( !p.Eval( new object[] { 2, 3 } ) ); ! Assert.IsTrue( !p.Eval( new object[] {} ) ); ! Assert.IsTrue( !p.Eval( new object[] { 2 } ) ); ! Assert.IsTrue( p.Eval( array1 ) ); ! Assert.IsTrue( p.Eval( new object[] { 1 } ) ); } *************** *** 74,88 **** object o2 = new object(); p = new NotEqual(o1); ! Assertion.Assert(!p.Eval(o1)); ! Assertion.Assert(p.Eval(o2)); ! Assertion.Assert(p.Eval(null)); int i1 = 1; int i2 = 2; p = new NotEqual(i1); ! Assertion.Assert(!p.Eval(i1)); ! Assertion.Assert(!p.Eval(1)); ! Assertion.Assert(p.Eval(i2)); ! Assertion.Assert(p.Eval(2)); } --- 74,88 ---- object o2 = new object(); p = new NotEqual(o1); ! Assert.IsTrue(!p.Eval(o1)); ! Assert.IsTrue(p.Eval(o2)); ! Assert.IsTrue(p.Eval(null)); int i1 = 1; int i2 = 2; p = new NotEqual(i1); ! Assert.IsTrue(!p.Eval(i1)); ! Assert.IsTrue(!p.Eval(1)); ! Assert.IsTrue(p.Eval(i2)); ! Assert.IsTrue(p.Eval(2)); } *************** *** 91,103 **** { p = new IsAnything(); ! Assertion.Assert(p.Eval(null)); ! Assertion.Assert(p.Eval(0)); ! Assertion.Assert(p.Eval(99)); ! Assertion.Assert(p.Eval(-2)); ! Assertion.Assert(p.Eval(true)); ! Assertion.Assert(p.Eval(false)); ! Assertion.Assert(p.Eval("")); ! Assertion.Assert(p.Eval("hello")); ! Assertion.Assert(p.Eval(new object())); } --- 91,103 ---- { p = new IsAnything(); ! Assert.IsTrue(p.Eval(null)); ! Assert.IsTrue(p.Eval(0)); ! Assert.IsTrue(p.Eval(99)); ! Assert.IsTrue(p.Eval(-2)); ! Assert.IsTrue(p.Eval(true)); ! Assert.IsTrue(p.Eval(false)); ! Assert.IsTrue(p.Eval("")); ! Assert.IsTrue(p.Eval("hello")); ! Assert.IsTrue(p.Eval(new object())); } *************** *** 106,112 **** { p = new IsTypeOf(typeof(TextReader)); ! Assertion.Assert(!p.Eval(null)); ! Assertion.Assert(p.Eval(new StringReader(""))); ! Assertion.Assert(!p.Eval(new StringWriter())); } --- 106,112 ---- { p = new IsTypeOf(typeof(TextReader)); ! Assert.IsTrue(!p.Eval(null)); ! Assert.IsTrue(p.Eval(new StringReader(""))); ! Assert.IsTrue(!p.Eval(new StringWriter())); } *************** *** 114,119 **** public void Not() { ! Assertion.Assert(new NotPredicate(new False()).Eval(null)); ! Assertion.Assert(!new NotPredicate(new True()).Eval(null)); } --- 114,119 ---- public void Not() { ! Assert.IsTrue(new NotPredicate(new False()).Eval(null)); ! Assert.IsTrue(!new NotPredicate(new True()).Eval(null)); } *************** *** 121,128 **** public void And() { ! Assertion.Assert( new AndPredicate(new True() , new True() ).Eval(null)); ! Assertion.Assert(!new AndPredicate(new True() , new False()).Eval(null)); ! Assertion.Assert(!new AndPredicate(new False(), new True() ).Eval(null)); ! Assertion.Assert(!new AndPredicate(new False(), new False()).Eval(null)); } --- 121,128 ---- public void And() { ! Assert.IsTrue( new AndPredicate(new True() , new True() ).Eval(null)); ! Assert.IsTrue(!new AndPredicate(new True() , new False()).Eval(null)); ! Assert.IsTrue(!new AndPredicate(new False(), new True() ).Eval(null)); ! Assert.IsTrue(!new AndPredicate(new False(), new False()).Eval(null)); } *************** *** 130,137 **** public void Or() { ! Assertion.Assert( new OrPredicate(new True() , new True() ).Eval(null)); ! Assertion.Assert( new OrPredicate(new True() , new False()).Eval(null)); ! Assertion.Assert( new OrPredicate(new False(), new True() ).Eval(null)); ! Assertion.Assert(!new OrPredicate(new False(), new False()).Eval(null)); } --- 130,137 ---- public void Or() { ! Assert.IsTrue( new OrPredicate(new True() , new True() ).Eval(null)); ! Assert.IsTrue( new OrPredicate(new True() , new False()).Eval(null)); ! Assert.IsTrue( new OrPredicate(new False(), new True() ).Eval(null)); ! Assert.IsTrue(!new OrPredicate(new False(), new False()).Eval(null)); } *************** *** 140,156 **** { p = new IsIn(2, 3, 5); ! Assertion.Assert(!p.Eval(1)); ! Assertion.Assert(p.Eval(2)); ! Assertion.Assert(p.Eval(3)); ! Assertion.Assert(!p.Eval(4)); ! Assertion.Assert(p.Eval(5)); ! Assertion.Assert(!p.Eval(6)); ! Assertion.Assert(!p.Eval(null)); int[] array = {1, 2}; p = new IsIn(array); ! Assertion.Assert(p.Eval(1)); ! Assertion.Assert(p.Eval(2)); ! Assertion.Assert(!p.Eval(3)); } --- 140,156 ---- { p = new IsIn(2, 3, 5); ! Assert.IsTrue(!p.Eval(1)); ! Assert.IsTrue(p.Eval(2)); ! Assert.IsTrue(p.Eval(3)); ! Assert.IsTrue(!p.Eval(4)); ! Assert.IsTrue(p.Eval(5)); ! Assert.IsTrue(!p.Eval(6)); ! Assert.IsTrue(!p.Eval(null)); int[] array = {1, 2}; p = new IsIn(array); ! Assert.IsTrue(p.Eval(1)); ! Assert.IsTrue(p.Eval(2)); ! Assert.IsTrue(!p.Eval(3)); } *************** *** 159,171 **** { p = new NotIn(1, 2); ! Assertion.Assert(!p.Eval(1)); ! Assertion.Assert(!p.Eval(2)); ! Assertion.Assert(p.Eval(3)); int[] array = {1, 2}; p = new NotIn(array); ! Assertion.Assert(!p.Eval(1)); ! Assertion.Assert(!p.Eval(2)); ! Assertion.Assert(p.Eval(3)); } --- 159,171 ---- { p = new NotIn(1, 2); ! Assert.IsTrue(!p.Eval(1)); ! Assert.IsTrue(!p.Eval(2)); ! Assert.IsTrue(p.Eval(3)); int[] array = {1, 2}; p = new NotIn(array); ! Assert.IsTrue(!p.Eval(1)); ! Assert.IsTrue(!p.Eval(2)); ! Assert.IsTrue(p.Eval(3)); } *************** *** 174,181 **** { p = new IsEqualIgnoreCase("heLLo"); ! Assertion.Assert(p.Eval("HELLO")); ! Assertion.Assert(p.Eval("hello")); ! Assertion.Assert(p.Eval("HelLo")); ! Assertion.Assert(!p.Eval("abcde")); } --- 174,181 ---- { p = new IsEqualIgnoreCase("heLLo"); ! Assert.IsTrue(p.Eval("HELLO")); ! Assert.IsTrue(p.Eval("hello")); ! Assert.IsTrue(p.Eval("HelLo")); ! Assert.IsTrue(!p.Eval("abcde")); } *************** *** 183,189 **** public void StripSpace() { ! Assertion.AssertEquals("Hello World", IsEqualIgnoreWhiteSpace.StripSpace("Hello\n \n World")); ! Assertion.AssertEquals("Hello World", IsEqualIgnoreWhiteSpace.StripSpace(" Hello World ")); ! Assertion.AssertEquals("", IsEqualIgnoreWhiteSpace.StripSpace(" ")); } --- 183,189 ---- public void StripSpace() { ! Assert.AreEqual("Hello World", IsEqualIgnoreWhiteSpace.StripSpace("Hello\n \n World")); ! Assert.AreEqual("Hello World", IsEqualIgnoreWhiteSpace.StripSpace(" Hello World ")); ! Assert.AreEqual("", IsEqualIgnoreWhiteSpace.StripSpace(" ")); } *************** *** 192,199 **** { p = new IsEqualIgnoreWhiteSpace("Hello World how\n are we?"); ! Assertion.Assert(p.Eval("Hello World how are we?")); ! Assertion.Assert(p.Eval(" Hello World how are \n\n\twe?")); ! Assertion.Assert(!p.Eval("HelloWorld how are we?")); ! Assertion.Assert(!p.Eval("Hello World how are we")); } --- 192,199 ---- { p = new IsEqualIgnoreWhiteSpace("Hello World how\n are we?"); ! Assert.IsTrue(p.Eval("Hello World how are we?")); ! Assert.IsTrue(p.Eval(" Hello World how are \n\n\twe?")); ! Assert.IsTrue(!p.Eval("HelloWorld how are we?")); ! Assert.IsTrue(!p.Eval("Hello World how are we")); } *************** *** 202,227 **** { p = new IsMatch(new Regex(@"^th[aeiou]\w* .*$")); ! Assertion.Assert(p.Eval("the world")); ! Assertion.Assert(!p.Eval("theworld")); ! Assertion.Assert(!p.Eval("ThE world")); ! Assertion.Assert(!p.Eval(" the world")); ! Assertion.Assert(p.Eval("thats nice")); ! Assertion.Assert(!p.Eval(new object())); ! Assertion.Assert(!p.Eval(null)); p = new IsMatch(@"^th[aeiou]\w* .*$"); ! Assertion.Assert(p.Eval("the world")); ! Assertion.Assert(!p.Eval("theworld")); ! Assertion.Assert(!p.Eval("ThE world")); p = new IsMatch(@"^th[aeiou]\w* .*$", false); ! Assertion.Assert(p.Eval("the world")); ! Assertion.Assert(!p.Eval("theworld")); ! Assertion.Assert(!p.Eval("ThE world")); p = new IsMatch(@"^th[aeiou]\w* .*$", true); ! Assertion.Assert(p.Eval("the world")); ! Assertion.Assert(!p.Eval("theworld")); ! Assertion.Assert(p.Eval("ThE world")); } --- 202,227 ---- { p = new IsMatch(new Regex(@"^th[aeiou]\w* .*$")); ! Assert.IsTrue(p.Eval("the world")); ! Assert.IsTrue(!p.Eval("theworld")); ! Assert.IsTrue(!p.Eval("ThE world")); ! Assert.IsTrue(!p.Eval(" the world")); ! Assert.IsTrue(p.Eval("thats nice")); ! Assert.IsTrue(!p.Eval(new object())); ! Assert.IsTrue(!p.Eval(null)); p = new IsMatch(@"^th[aeiou]\w* .*$"); ! Assert.IsTrue(p.Eval("the world")); ! Assert.IsTrue(!p.Eval("theworld")); ! Assert.IsTrue(!p.Eval("ThE world")); p = new IsMatch(@"^th[aeiou]\w* .*$", false); ! Assert.IsTrue(p.Eval("the world")); ! Assert.IsTrue(!p.Eval("theworld")); ! Assert.IsTrue(!p.Eval("ThE world")); p = new IsMatch(@"^th[aeiou]\w* .*$", true); ! Assert.IsTrue(p.Eval("the world")); ! Assert.IsTrue(!p.Eval("theworld")); ! Assert.IsTrue(p.Eval("ThE world")); } *************** *** 232,239 **** p = new Predicate(new Predicate.EvaluationMethod(myEval)); myFlag = false; ! Assertion.Assert(p.Eval(null)); ! Assertion.Assert(!p.Eval(null)); ! Assertion.Assert(p.Eval(null)); ! Assertion.Assert(!p.Eval(null)); } --- 232,239 ---- p = new Predicate(new Predicate.EvaluationMethod(myEval)); myFlag = false; ! Assert.IsTrue(p.Eval(null)); ! Assert.IsTrue(!p.Eval(null)); ! Assert.IsTrue(p.Eval(null)); ! Assert.IsTrue(!p.Eval(null)); } Index: AbstractDynamicMockTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/AbstractDynamicMockTests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AbstractDynamicMockTests.cs 9 Jan 2005 21:05:06 -0000 1.1 --- AbstractDynamicMockTests.cs 12 Feb 2005 18:10:36 -0000 1.2 *************** *** 66,70 **** blah.MethodWithRefParameter(ref p1); ! Assertion.AssertEquals("goodbye", p1); mock.Verify(); } --- 66,70 ---- blah.MethodWithRefParameter(ref p1); ! Assert.AreEqual("goodbye", p1); mock.Verify(); } *************** *** 81,85 **** blah.MethodWithOutParameter(out p1); ! Assertion.AssertEquals("hello", p1); mock.Verify(); } --- 81,85 ---- blah.MethodWithOutParameter(out p1); ! Assert.AreEqual("hello", p1); mock.Verify(); } *************** *** 89,98 **** { IDynamicMock mock = newDynamicMock(typeof(IBlah)); ! Assertion.AssertEquals("MockBlah", mock.MockName); mock.ExpectAndReturn("DoStuff", "world", "hello"); IBlah blah = (IBlah)mock.Object; ! Assertion.AssertEquals("world", blah.DoStuff("hello")); mock.Verify(); --- 89,98 ---- { IDynamicMock mock = newDynamicMock(typeof(IBlah)); ! Assert.AreEqual("MockBlah", mock.MockName); mock.ExpectAndReturn("DoStuff", "world", "hello"); IBlah blah = (IBlah)mock.Object; ! Assert.AreEqual("world", blah.DoStuff("hello")); mock.Verify(); *************** *** 103,107 **** { IDynamicMock mock = newDynamicMock(typeof(IBlah), "XBlah"); ! Assertion.AssertEquals("XBlah", mock.MockName); mock.Verify(); } --- 103,107 ---- { IDynamicMock mock = newDynamicMock(typeof(IBlah), "XBlah"); ! Assert.AreEqual("XBlah", mock.MockName); mock.Verify(); } *************** *** 113,117 **** mock.ExpectAndReturn( "DoStuffBooleanStyle", false, true ); IBlah blah = (IBlah) mock.Object; ! Assertion.AssertEquals( false, blah.DoStuffBooleanStyle( true ) ); mock.Verify(); } --- 113,117 ---- mock.ExpectAndReturn( "DoStuffBooleanStyle", false, true ); IBlah blah = (IBlah) mock.Object; ! Assert.AreEqual( false, blah.DoStuffBooleanStyle( true ) ); mock.Verify(); } *************** *** 124,128 **** IBlah blah = (IBlah)mock.Object; ! Assertion.AssertEquals( "world2", blah.DoStuffWithParams("12345", "hello") ); mock.Verify(); --- 124,128 ---- IBlah blah = (IBlah)mock.Object; ! Assert.AreEqual( "world2", blah.DoStuffWithParams("12345", "hello") ); mock.Verify(); *************** *** 136,140 **** IBlah blah = (IBlah)mock.Object; ! Assertion.AssertEquals( "world2", blah.DoStuffWithParams("12345", "hello", "dotnetmock") ); mock.Verify(); } --- 136,140 ---- IBlah blah = (IBlah)mock.Object; ! Assert.AreEqual( "world2", blah.DoStuffWithParams("12345", "hello", "dotnetmock") ); mock.Verify(); } *************** *** 142,146 **** public void Name() { ! Assertion.AssertEquals("mymock", mock.MockName); } --- 142,146 ---- public void Name() { ! Assert.AreEqual("mymock", mock.MockName); } *************** *** 228,232 **** object result = mock.Call(myMethod); mock.Verify(); ! Assertion.AssertEquals(something, result); } --- 228,232 ---- object result = mock.Call(myMethod); mock.Verify(); ! Assert.AreEqual(something, result); } *************** *** 238,242 **** object result = mock.Call(myMethod, "hello"); mock.Verify(); ! Assertion.AssertEquals(something, result); } --- 238,242 ---- object result = mock.Call(myMethod, "hello"); mock.Verify(); ! Assert.AreEqual(something, result); } *************** *** 249,253 **** object result = mock.Call(myMethod, "bye"); mock.Verify(); ! Assertion.AssertEquals(something, result); } --- 249,253 ---- object result = mock.Call(myMethod, "bye"); mock.Verify(); ! Assert.AreEqual(something, result); } *************** *** 261,267 **** mock.ExpectAndReturn("myMethod", anotherthing); mock.ExpectAndReturn("myMethod", x); ! Assertion.AssertEquals(something, mock.Call(myMethod)); ! Assertion.AssertEquals(anotherthing, mock.Call(myMethod)); ! Assertion.AssertEquals(x, mock.Call(myMethod)); mock.Verify(); } --- 261,267 ---- mock.ExpectAndReturn("myMethod", anotherthing); mock.ExpectAndReturn("myMethod", x); ! Assert.AreEqual(something, mock.Call(myMethod)); ! Assert.AreEqual(anotherthing, mock.Call(myMethod)); ! Assert.AreEqual(x, mock.Call(myMethod)); mock.Verify(); } *************** *** 271,275 **** { mock.ExpectAndReturn("myMethod", null); ! Assertion.AssertNull(mock.Call(myMethod)); mock.Verify(); } --- 271,275 ---- { mock.ExpectAndReturn("myMethod", null); ! Assert.IsNull(mock.Call(myMethod)); mock.Verify(); } *************** *** 307,323 **** mock.SetValue("myMethod", "hello"); mock.SetValue("anotherMethod", "world"); ! Assertion.AssertEquals("hello", mock.Call(myMethod)); ! Assertion.AssertEquals("hello", mock.Call(myMethod)); ! Assertion.AssertEquals("hello", mock.Call(myMethod)); ! Assertion.AssertEquals("hello", mock.Call(myMethod)); ! Assertion.AssertEquals("world", mock.Call(anotherMethod)); ! Assertion.AssertEquals("world", mock.Call(anotherMethod)); mock.SetValue("myMethod", "bye"); ! Assertion.AssertEquals("bye", mock.Call(myMethod)); ! Assertion.AssertEquals("bye", mock.Call(myMethod)); ! Assertion.AssertEquals("world", mock.Call(anotherMethod)); mock.SetValue("myMethod", null); ! Assertion.AssertNull(mock.Call(myMethod)); ! Assertion.AssertNull(mock.Call(myMethod)); mock.Verify(); } --- 307,323 ---- mock.SetValue("myMethod", "hello"); mock.SetValue("anotherMethod", "world"); ! Assert.AreEqual("hello", mock.Call(myMethod)); ! Assert.AreEqual("hello", mock.Call(myMethod)); ! Assert.AreEqual("hello", mock.Call(myMethod)); ! Assert.AreEqual("hello", mock.Call(myMethod)); ! Assert.AreEqual("world", mock.Call(anotherMethod)); ! Assert.AreEqual("world", mock.Call(anotherMethod)); mock.SetValue("myMethod", "bye"); ! Assert.AreEqual("bye", mock.Call(myMethod)); ! Assert.AreEqual("bye", mock.Call(myMethod)); ! Assert.AreEqual("world", mock.Call(anotherMethod)); mock.SetValue("myMethod", null); ! Assert.IsNull(mock.Call(myMethod)); ! Assert.IsNull(mock.Call(myMethod)); mock.Verify(); } |
|
From: Griffin C. <gc...@us...> - 2005-02-12 18:10:44
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.TestFramework.Tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6085/DotNetMock.TestFramework.Tests Modified Files: ImplementationFactoryTests.cs Log Message: - Upgraded Tests to use NUnit 2.2 Index: ImplementationFactoryTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.TestFramework.Tests/ImplementationFactoryTests.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ImplementationFactoryTests.cs 5 Feb 2005 21:46:26 -0000 1.3 --- ImplementationFactoryTests.cs 12 Feb 2005 18:10:35 -0000 1.4 *************** *** 47,52 **** { linker.ExpectedAssemblyName = "nunit.framework"; ! linker.ExpectedAssembly = typeof(NUnit.Framework.Assertion).Module.Assembly; ! linker.ExpectedType = typeof(NUnit.Framework.Assertion); ImplementationFactory factory = new ImplementationFactory(env, linker); --- 47,52 ---- { linker.ExpectedAssemblyName = "nunit.framework"; ! linker.ExpectedAssembly = typeof(Assertion).Module.Assembly; ! linker.ExpectedType = typeof(Assertion); ImplementationFactory factory = new ImplementationFactory(env, linker); *************** *** 58,62 **** Assert.AreEqual("nunit.framework", linker.ActualAssemblyNames.Pop()); Assert.AreEqual("NUnit.Framework.Assertion", linker.ActualTypeName); ! Assert.AreSame(typeof(NUnit.Framework.Assertion).Module.Assembly, linker.ActualAssembly); Assert.AreEqual("ProviderStub", linker.ActualType.FullName); } --- 58,62 ---- Assert.AreEqual("nunit.framework", linker.ActualAssemblyNames.Pop()); Assert.AreEqual("NUnit.Framework.Assertion", linker.ActualTypeName); ! Assert.AreSame(typeof(Assertion).Module.Assembly, linker.ActualAssembly); Assert.AreEqual("ProviderStub", linker.ActualType.FullName); } *************** *** 102,107 **** linker.ExpectedAssemblyName = "xxx"; linker.ExpectedPartialAssemblyName = "nunit.framework"; ! linker.ExpectedAssembly = typeof(NUnit.Framework.Assertion).Module.Assembly; ! linker.ExpectedType = typeof(NUnit.Framework.Assertion); ImplementationFactory factory = new ImplementationFactory(env, linker); --- 102,107 ---- linker.ExpectedAssemblyName = "xxx"; linker.ExpectedPartialAssemblyName = "nunit.framework"; ! linker.ExpectedAssembly = typeof(Assertion).Module.Assembly; ! linker.ExpectedType = typeof(Assertion); ImplementationFactory factory = new ImplementationFactory(env, linker); *************** *** 116,120 **** Assert.AreEqual("nunit.framework", linker.ActualAssemblyNames.Pop()); Assert.AreEqual("NUnit.Framework.Assertion", linker.ActualTypeName); ! Assert.AreSame(typeof(NUnit.Framework.Assertion).Module.Assembly, linker.ActualAssembly); Assert.AreEqual("ProviderStub", linker.ActualType.FullName); } --- 116,120 ---- Assert.AreEqual("nunit.framework", linker.ActualAssemblyNames.Pop()); Assert.AreEqual("NUnit.Framework.Assertion", linker.ActualTypeName); ! Assert.AreSame(typeof(Assertion).Module.Assembly, linker.ActualAssembly); Assert.AreEqual("ProviderStub", linker.ActualType.FullName); } |
|
From: Griffin C. <gc...@us...> - 2005-02-12 18:10:44
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6085/DotNetMock.Framework.Tests/Data Modified Files: MockDataParameterCollectionTests.cs Log Message: - Upgraded Tests to use NUnit 2.2 Index: MockDataParameterCollectionTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/Data/MockDataParameterCollectionTests.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MockDataParameterCollectionTests.cs 9 Oct 2004 21:14:12 -0000 1.7 --- MockDataParameterCollectionTests.cs 12 Feb 2005 18:10:35 -0000 1.8 *************** *** 107,114 **** { _mockDataParameterCollection.Add("@inpID", "123456"); ! NUnit.Framework.Assertion.Assert("Parameter @inpID not found - First", _mockDataParameterCollection.Contains("@inpID")); _mockDataParameterCollection.Add("@inpPassword", "password"); ! NUnit.Framework.Assertion.Assert("Parameter @inpID not found - Second", _mockDataParameterCollection.Contains("@inpID")); ! NUnit.Framework.Assertion.Assert("Parameter @inpPassword not found", _mockDataParameterCollection.Contains("@inpPassword")); } --- 107,114 ---- { _mockDataParameterCollection.Add("@inpID", "123456"); ! Assert.IsTrue(_mockDataParameterCollection.Contains("@inpID"), "Parameter @inpID not found - First"); _mockDataParameterCollection.Add("@inpPassword", "password"); ! Assert.IsTrue( _mockDataParameterCollection.Contains("@inpID"), "Parameter @inpID not found - Second"); ! Assert.IsTrue( _mockDataParameterCollection.Contains("@inpPassword"), "Parameter @inpPassword not found"); } *************** *** 117,121 **** { IDataParameter mockDP = _mockDataParameterCollection.Add("@inpID", "123456"); ! NUnit.Framework.Assertion.Assert(!_mockDataParameterCollection.Contains("@inpPassword")); } [Test] --- 117,121 ---- { IDataParameter mockDP = _mockDataParameterCollection.Add("@inpID", "123456"); ! Assert.IsTrue(!_mockDataParameterCollection.Contains("@inpPassword")); } [Test] *************** *** 124,132 **** _mockDataParameterCollection.Add("@inpID", "123456"); _mockDataParameterCollection.Add("@inpPassword", "password"); ! NUnit.Framework.Assertion.Assert(_mockDataParameterCollection.Contains("@inpID")); ! NUnit.Framework.Assertion.Assert(_mockDataParameterCollection.Contains("@inpPassword")); _mockDataParameterCollection.RemoveAt("@inpID"); ! NUnit.Framework.Assertion.Assert(!_mockDataParameterCollection.Contains("@inpID")); ! NUnit.Framework.Assertion.Assert(_mockDataParameterCollection.Contains("@inpPassword")); } [Test] --- 124,132 ---- _mockDataParameterCollection.Add("@inpID", "123456"); _mockDataParameterCollection.Add("@inpPassword", "password"); ! Assert.IsTrue(_mockDataParameterCollection.Contains("@inpID")); ! Assert.IsTrue(_mockDataParameterCollection.Contains("@inpPassword")); _mockDataParameterCollection.RemoveAt("@inpID"); ! Assert.IsTrue(!_mockDataParameterCollection.Contains("@inpID")); ! Assert.IsTrue(_mockDataParameterCollection.Contains("@inpPassword")); } [Test] *************** *** 143,148 **** _mockDataParameterCollection.Add("@inpPassword", "password"); _mockDataParameterCollection.Add("@inpThird", "third"); ! NUnit.Framework.Assertion.AssertEquals("Indexes do not equal", 1, _mockDataParameterCollection.IndexOf("@inpPassword")); ! NUnit.Framework.Assertion.AssertEquals("Indexes do not equal", 0, _mockDataParameterCollection.IndexOf("@inpID")); } [Test] --- 143,148 ---- _mockDataParameterCollection.Add("@inpPassword", "password"); _mockDataParameterCollection.Add("@inpThird", "third"); ! Assert.AreEqual( 1, _mockDataParameterCollection.IndexOf("@inpPassword"), "Indexes do not equal"); ! Assert.AreEqual( 0, _mockDataParameterCollection.IndexOf("@inpID"), "Indexes do not equal"); } [Test] *************** *** 153,157 **** IDataParameter mockDP1 = _mockDataParameterCollection.Add("@inpPassword", "password"); IDataParameter mockDP2 = _mockDataParameterCollection.Add("@inpThird", "third"); ! NUnit.Framework.Assertion.AssertEquals("Index not found", 4, _mockDataParameterCollection.IndexOf("@inpFake")); } [Test] --- 153,157 ---- IDataParameter mockDP1 = _mockDataParameterCollection.Add("@inpPassword", "password"); IDataParameter mockDP2 = _mockDataParameterCollection.Add("@inpThird", "third"); ! Assert.AreEqual(4, _mockDataParameterCollection.IndexOf("@inpFake"), "Index not found"); } [Test] *************** *** 160,164 **** MockDataParameter mockDP = new MockDataParameter("@inpID", "123456"); _mockDataParameterCollection.Add(mockDP); ! NUnit.Framework.Assertion.AssertEquals("Parameters not equal", mockDP, _mockDataParameterCollection["@inpID"]); } [Test] --- 160,164 ---- MockDataParameter mockDP = new MockDataParameter("@inpID", "123456"); _mockDataParameterCollection.Add(mockDP); ! Assert.AreEqual( mockDP, _mockDataParameterCollection["@inpID"], "Parameters not equal"); } [Test] *************** *** 168,172 **** MockDataParameter mockDP = new MockDataParameter("@inpID", "654321"); _mockDataParameterCollection.Add(mockDP); ! NUnit.Framework.Assertion.AssertEquals("Parameters not equal", mockDP, _mockDataParameterCollection["@inpPadssword"]); } [Test] --- 168,172 ---- MockDataParameter mockDP = new MockDataParameter("@inpID", "654321"); _mockDataParameterCollection.Add(mockDP); ! Assert.AreEqual( mockDP, _mockDataParameterCollection["@inpPadssword"], "Parameters not equal"); } [Test] |
|
From: Choy R. <ch...@us...> - 2005-02-12 09:49:20
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1821/DotNetMock.Framework/Data Modified Files: MockDbDataAdapter.cs Log Message: Finished eliminating all warnings about missing XML comments. Index: MockDbDataAdapter.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDbDataAdapter.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MockDbDataAdapter.cs 12 Feb 2005 08:53:57 -0000 1.8 --- MockDbDataAdapter.cs 12 Feb 2005 09:49:11 -0000 1.9 *************** *** 1,10 **** using System; using System.Data; using System.Data.Common; - using DotNetMock; namespace DotNetMock.Framework.Data { public class MockDbDataAdapter : DbDataAdapter, IMockObject, IDbDataAdapter { --- 1,19 ---- + #region License + // Copyright (c) 2004, 2005 Griffin Caprio & Choy Rim. All rights reserved. + #endregion + #region Imports using System; using System.Data; using System.Data.Common; + using DotNetMock; + #endregion namespace DotNetMock.Framework.Data { + /// <summary> + /// Mock <see cref="DbDataAdapter"/>. + /// </summary> + /// <author>Griffin Caprio</author> public class MockDbDataAdapter : DbDataAdapter, IMockObject, IDbDataAdapter { *************** *** 20,27 **** --- 29,42 ---- #region Public Constructors + /// <summary> + /// Create mock <see cref="DbDataAdapter"/>. + /// </summary> public MockDbDataAdapter() { this._name = "MockDbDataAdapter"; } + /// <summary> + /// Create mock <see cref="DbDataAdapter"/>. + /// </summary> public MockDbDataAdapter( IDbCommand selectCommand ) { *************** *** 29,32 **** --- 44,50 ---- } + /// <summary> + /// Create mock <see cref="DbDataAdapter"/>. + /// </summary> public MockDbDataAdapter( IDbCommand selectCommand, string selectConnectionString ) { *************** *** 34,37 **** --- 52,58 ---- } + /// <summary> + /// Create mock <see cref="DbDataAdapter"/>. + /// </summary> public MockDbDataAdapter( string selectCommandText, IDbConnection selectConnection ) { *************** *** 41,48 **** --- 62,78 ---- #region Mock Methods + /// <summary> + /// Set the expected number of Fill calls. + /// </summary> + /// <param name="calls">number of expected Fill calls</param> public void SetExpectedFillCalls( int calls ) { _expectedFillCalls.Expected = calls; } + /// <summary> + /// Set the <see cref="DataSet"/> that will be returned by + /// the Fill call. + /// </summary> + /// <param name="dataSet">expected <see cref="DataSet"/></param> public void SetExpectedDataSet( DataSet dataSet ) { *************** *** 52,60 **** #region Implementation of IMockObject public void NotImplemented(string methodName) { throw new NotImplementedException( methodName + " is currently not implemented." ); } ! public string MockName { --- 82,96 ---- #region Implementation of IMockObject + /// <summary> + /// <see cref="IMockObject.NotImplemented"/> + /// </summary> + /// <param name="methodName">name of method not implemented</param> public void NotImplemented(string methodName) { throw new NotImplementedException( methodName + " is currently not implemented." ); } ! /// <summary> ! /// Name of this mock object. ! /// </summary> public string MockName { *************** *** 71,74 **** --- 107,113 ---- #region Implementation of IVerifiable + /// <summary> + /// <see cref="IVerifiable.Verify"/> + /// </summary> public void Verify() { *************** *** 79,102 **** #region Implementation of DbDataAdapter ! protected override System.Data.Common.RowUpdatedEventArgs CreateRowUpdatedEvent(System.Data.DataRow dataRow, System.Data.IDbCommand command, System.Data.StatementType statementType, System.Data.Common.DataTableMapping tableMapping) { return null; } ! protected override System.Data.Common.RowUpdatingEventArgs CreateRowUpdatingEvent(System.Data.DataRow dataRow, System.Data.IDbCommand command, System.Data.StatementType statementType, System.Data.Common.DataTableMapping tableMapping) { return null; } ! protected override void OnRowUpdated(System.Data.Common.RowUpdatedEventArgs value) { } ! protected override void OnRowUpdating(System.Data.Common.RowUpdatingEventArgs value) { } protected override int Fill(System.Data.DataTable dataTable, System.Data.IDataReader dataReader) { --- 118,152 ---- #region Implementation of DbDataAdapter ! /// <summary> ! /// <see cref="DbDataAdapter.CreateRowUpdatingEvent"/> ! /// </summary> protected override System.Data.Common.RowUpdatedEventArgs CreateRowUpdatedEvent(System.Data.DataRow dataRow, System.Data.IDbCommand command, System.Data.StatementType statementType, System.Data.Common.DataTableMapping tableMapping) { return null; } ! /// <summary> ! /// <see cref="DbDataAdapter.CreateRowUpdatingEvent"/> ! /// </summary> protected override System.Data.Common.RowUpdatingEventArgs CreateRowUpdatingEvent(System.Data.DataRow dataRow, System.Data.IDbCommand command, System.Data.StatementType statementType, System.Data.Common.DataTableMapping tableMapping) { return null; } ! /// <summary> ! /// <see cref="DbDataAdapter.OnRowUpdating"/> ! /// </summary> protected override void OnRowUpdated(System.Data.Common.RowUpdatedEventArgs value) { } ! /// <summary> ! /// <see cref="DbDataAdapter.OnRowUpdating"/> ! /// </summary> protected override void OnRowUpdating(System.Data.Common.RowUpdatingEventArgs value) { } + /// <summary> + /// <see cref="DbDataAdapter.Fill"/> + /// </summary> protected override int Fill(System.Data.DataTable dataTable, System.Data.IDataReader dataReader) { *************** *** 104,108 **** return 0; } ! protected override int Fill(System.Data.DataSet dataSet, string srcTable, System.Data.IDataReader dataReader, int startRecord, int maxRecords) { --- 154,160 ---- return 0; } ! /// <summary> ! /// <see cref="DbDataAdapter.Fill"/> ! /// </summary> protected override int Fill(System.Data.DataSet dataSet, string srcTable, System.Data.IDataReader dataReader, int startRecord, int maxRecords) { *************** *** 110,114 **** return 0; } ! protected override int Fill(System.Data.DataTable dataTable, System.Data.IDbCommand command, System.Data.CommandBehavior behavior) { --- 162,168 ---- return 0; } ! /// <summary> ! /// <see cref="DbDataAdapter.Fill"/> ! /// </summary> protected override int Fill(System.Data.DataTable dataTable, System.Data.IDbCommand command, System.Data.CommandBehavior behavior) { *************** *** 116,120 **** return 0; } ! protected override int Fill(System.Data.DataSet dataSet, int startRecord, int maxRecords, string srcTable, System.Data.IDbCommand command, System.Data.CommandBehavior behavior) { --- 170,176 ---- return 0; } ! /// <summary> ! /// <see cref="DbDataAdapter.Fill"/> ! /// </summary> protected override int Fill(System.Data.DataSet dataSet, int startRecord, int maxRecords, string srcTable, System.Data.IDbCommand command, System.Data.CommandBehavior behavior) { *************** *** 122,126 **** return 0; } ! public override int Fill(System.Data.DataSet dataSet) { --- 178,184 ---- return 0; } ! /// <summary> ! /// <see cref="DbDataAdapter.Fill"/> ! /// </summary> public override int Fill(System.Data.DataSet dataSet) { *************** *** 128,131 **** --- 186,192 ---- return 0; } + /// <summary> + /// <see cref="DbDataAdapter.Fill"/> + /// </summary> public new int Fill( System.Data.DataSet dataSet, string srcTable ) { *************** *** 133,136 **** --- 194,200 ---- return 0; } + /// <summary> + /// <see cref="DbDataAdapter.Fill"/> + /// </summary> public new int Fill( System.Data.DataSet dataSet, int startRecord, int maxRecords, string srcTable ) { *************** *** 138,141 **** --- 202,208 ---- return 0; } + /// <summary> + /// <see cref="DbDataAdapter.Fill"/> + /// </summary> public new int Fill( DataTable dataTable ) { *************** *** 143,203 **** return 0; } ! protected override void Dispose(bool disposing) { } protected override System.Data.DataTable FillSchema(System.Data.DataTable dataTable, System.Data.SchemaType schemaType, System.Data.IDbCommand command, System.Data.CommandBehavior behavior) { return null; } ! protected override System.Data.DataTable[] FillSchema(System.Data.DataSet dataSet, System.Data.SchemaType schemaType, System.Data.IDbCommand command, string srcTable, System.Data.CommandBehavior behavior) { return null; } protected new System.Data.DataTable[] FillSchema(System.Data.DataSet dataSet, System.Data.SchemaType schemaType, string srcTable ) { return null; } public override System.Data.DataTable[] FillSchema(System.Data.DataSet dataSet, System.Data.SchemaType schemaType) { return null; } public new System.Data.DataTable FillSchema(System.Data.DataTable dataTable, System.Data.SchemaType schemaType) { return null; } - private void innerExecute() { _expectedFillCalls.Inc(); } ! public override System.Data.IDataParameter[] GetFillParameters() { return null; } ! protected override void OnFillError(System.Data.FillErrorEventArgs value) { } protected override int Update(System.Data.DataRow[] dataRows, System.Data.Common.DataTableMapping tableMapping) { return 0; } public new int Update(System.Data.DataSet dataSet, string srcTable) { return 0; } public new int Update(System.Data.DataTable dataTable) { return 0; } public new int Update(System.Data.DataRow[] dataRows) { return 0; } public override int Update(System.Data.DataSet dataSet) { --- 210,304 ---- return 0; } ! /// <summary> ! /// <see cref="DbDataAdapter.Dispose"/> ! /// </summary> protected override void Dispose(bool disposing) { } + /// <summary> + /// <see cref="DbDataAdapter.FillSchema"/> + /// </summary> protected override System.Data.DataTable FillSchema(System.Data.DataTable dataTable, System.Data.SchemaType schemaType, System.Data.IDbCommand command, System.Data.CommandBehavior behavior) { return null; } ! /// <summary> ! /// <see cref="DbDataAdapter.FillSchema"/> ! /// </summary> protected override System.Data.DataTable[] FillSchema(System.Data.DataSet dataSet, System.Data.SchemaType schemaType, System.Data.IDbCommand command, string srcTable, System.Data.CommandBehavior behavior) { return null; } + /// <summary> + /// <see cref="DbDataAdapter.FillSchema"/> + /// </summary> protected new System.Data.DataTable[] FillSchema(System.Data.DataSet dataSet, System.Data.SchemaType schemaType, string srcTable ) { return null; } + /// <summary> + /// <see cref="DbDataAdapter.FillSchema"/> + /// </summary> public override System.Data.DataTable[] FillSchema(System.Data.DataSet dataSet, System.Data.SchemaType schemaType) { return null; } + /// <summary> + /// <see cref="DbDataAdapter.FillSchema"/> + /// </summary> public new System.Data.DataTable FillSchema(System.Data.DataTable dataTable, System.Data.SchemaType schemaType) { return null; } private void innerExecute() { _expectedFillCalls.Inc(); } ! /// <summary> ! /// <see cref="DbDataAdapter.GetFillParameters"/> ! /// </summary> public override System.Data.IDataParameter[] GetFillParameters() { return null; } ! /// <summary> ! /// <see cref="DbDataAdapter.OnFillError"/> ! /// </summary> protected override void OnFillError(System.Data.FillErrorEventArgs value) { } + /// <summary> + /// <see cref="DbDataAdapter.Update"/> + /// </summary> protected override int Update(System.Data.DataRow[] dataRows, System.Data.Common.DataTableMapping tableMapping) { return 0; } + /// <summary> + /// <see cref="DbDataAdapter.Update"/> + /// </summary> public new int Update(System.Data.DataSet dataSet, string srcTable) { return 0; } + /// <summary> + /// <see cref="DbDataAdapter.Update"/> + /// </summary> public new int Update(System.Data.DataTable dataTable) { return 0; } + /// <summary> + /// <see cref="DbDataAdapter.Update"/> + /// </summary> public new int Update(System.Data.DataRow[] dataRows) { return 0; } + /// <summary> + /// <see cref="DbDataAdapter.Update"/> + /// </summary> public override int Update(System.Data.DataSet dataSet) { *************** *** 207,211 **** #region IDbDataAdapter Members ! public IDbCommand UpdateCommand { --- 308,314 ---- #region IDbDataAdapter Members ! /// <summary> ! /// <see cref="IDbDataAdapter.UpdateCommand"/> ! /// </summary> public IDbCommand UpdateCommand { *************** *** 219,223 **** } } ! public IDbCommand SelectCommand { --- 322,328 ---- } } ! /// <summary> ! /// <see cref="IDbDataAdapter.SelectCommand"/> ! /// </summary> public IDbCommand SelectCommand { *************** *** 231,235 **** } } ! public IDbCommand DeleteCommand { --- 336,342 ---- } } ! /// <summary> ! /// <see cref="IDbDataAdapter.DeleteCommand"/> ! /// </summary> public IDbCommand DeleteCommand { *************** *** 243,247 **** } } ! public IDbCommand InsertCommand { --- 350,356 ---- } } ! /// <summary> ! /// <see cref="IDbDataAdapter.InsertCommand"/> ! /// </summary> public IDbCommand InsertCommand { *************** *** 255,259 **** } } - #endregion --- 364,367 ---- *************** *** 264,268 **** #region IVerifiable Members ! public bool IsVerified { --- 372,378 ---- #region IVerifiable Members ! /// <summary> ! /// <see cref="IVerifiable.IsVerified"/> ! /// </summary> public bool IsVerified { *************** *** 272,276 **** } } - #endregion } --- 382,385 ---- |
|
From: Choy R. <ch...@us...> - 2005-02-12 09:33:04
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28145/DotNetMock.Framework/Data Modified Files: MockDataSet.cs Log Message: Eliminate more warnings about missing XML comments ... Index: MockDataSet.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDataSet.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MockDataSet.cs 16 Jul 2004 16:03:29 -0000 1.3 --- MockDataSet.cs 12 Feb 2005 09:32:55 -0000 1.4 *************** *** 10,19 **** --- 10,36 ---- public class MockDataSet : DataSet, IMockObject { + /// <summary> + /// Name of this mock <see cref="DataSet"/>. + /// Defaults to 'MockDataSet'. + /// </summary> protected string name = ""; + /// <summary> + /// Stores whether this object has been verified yet. + /// Defaults to false. + /// </summary> protected bool verified = false; + /// <summary> + /// Creates a mock <see cref="DataSet"/>. + /// </summary> public MockDataSet() { this.name = "MockDataSet"; } + /// <summary> + /// Sets the rows that will be returned by the first + /// <see cref="DataTable"/> in this <see cref="DataSet"/>. + /// </summary> + /// <param name="data">n x m array of data representing + /// a <see cref="DataTable"/> in this <see cref="DataSet"/></param> public void SetRows( object[,] data ) { *************** *** 51,59 **** #region Implementation of IMockObject public void NotImplemented(string methodName) { throw new NotImplementedException( methodName + " is currently not implemented." ); } ! public string MockName { --- 68,82 ---- #region Implementation of IMockObject + /// <summary> + /// <see cref="IMockObject.NotImplemented"/> + /// </summary> + /// <param name="methodName">name of method not implemented</param> public void NotImplemented(string methodName) { throw new NotImplementedException( methodName + " is currently not implemented." ); } ! /// <summary> ! /// Name of this mock object. ! /// </summary> public string MockName { *************** *** 67,70 **** --- 90,97 ---- } } + /// <summary> + /// Whether this mock object has been verified. + /// <see cref="Verify"/> + /// </summary> public bool IsVerified { *************** *** 74,77 **** --- 101,107 ---- #region Implementation of IVerifiable + /// <summary> + /// <see cref="IVerifiable.Verify"/> + /// </summary> public void Verify() { |
|
From: Choy R. <ch...@us...> - 2005-02-12 09:23:50
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24361/DotNetMock.Framework/Data Modified Files: MockDataParameter.cs MockDataParameterCollection.cs MockDataReader.cs MockTransaction.cs Log Message: Begin to eliminate warnings about missing XML comments ... Index: MockDataReader.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDataReader.cs,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** MockDataReader.cs 5 Feb 2005 22:05:09 -0000 1.22 --- MockDataReader.cs 12 Feb 2005 09:23:39 -0000 1.23 *************** *** 26,30 **** --- 26,36 ---- private Exception _getException = null; + /// <summary> + /// Create mock implementation of <see cref="IDataReader"/>. + /// </summary> public MockDataReader() {} + /// <summary> + /// Create named mock implementation of <see cref="IDataReader"/>. + /// </summary> public MockDataReader( string mockName ) : base(mockName) { *************** *** 119,122 **** --- 125,131 ---- #region Implementation of IDataReader + /// <summary> + /// <see cref="IDataReader.Close"/> + /// </summary> public void Close() { *************** *** 483,486 **** --- 492,498 ---- #region Implementation of IDisposable + /// <summary> + /// <see cref="IDisposable.Dispose"/> + /// </summary> public void Dispose() { Index: MockDataParameterCollection.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDataParameterCollection.cs,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MockDataParameterCollection.cs 9 Oct 2004 21:14:12 -0000 1.14 --- MockDataParameterCollection.cs 12 Feb 2005 09:23:39 -0000 1.15 *************** *** 312,315 **** --- 312,318 ---- #endregion #region MockObject overrides + /// <summary> + /// <see cref="MockObject.Verify"/> + /// </summary> public override void Verify() { Index: MockTransaction.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockTransaction.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MockTransaction.cs 29 Mar 2004 02:30:57 -0000 1.6 --- MockTransaction.cs 12 Feb 2005 09:23:39 -0000 1.7 *************** *** 25,40 **** --- 25,56 ---- #region Mock Methods + /// <summary> + /// Set expected <see cref="Exception"/> on commit. + /// </summary> + /// <param name="exception">expected <see cref="Exception"/></param> public void SetExpectedCommitException( Exception exception ) { _commitException = exception; } + /// <summary> + /// Set expected <see cref="Exception"/> on rollback. + /// </summary> + /// <param name="exception">expected <see cref="Exception"/></param> public void SetExpectedRollbackException( Exception exception ) { _rollbackException = exception; } + /// <summary> + /// Set whether a commit call is expected. + /// </summary> + /// <param name="commit">true if we expect a commit call</param> public void ExpectCommitCall( bool commit ) { _commitCalled.Expected = commit; } + /// <summary> + /// Set whether a rollback call is expected. + /// </summary> + /// <param name="rollback">true if we expect a rollback call</param> public void ExpectRollbackCall( bool rollback ) { Index: MockDataParameter.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDataParameter.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MockDataParameter.cs 29 Mar 2004 02:34:24 -0000 1.8 --- MockDataParameter.cs 12 Feb 2005 09:23:26 -0000 1.9 *************** *** 227,230 **** --- 227,233 ---- #region IDbDataParameter Members + /// <summary> + /// <see cref="IDbDataParameter.Precision"/> + /// </summary> public byte Precision { *************** *** 240,243 **** --- 243,249 ---- } + /// <summary> + /// <see cref="IDbDataParameter.Scale"/> + /// </summary> public byte Scale { *************** *** 253,256 **** --- 259,265 ---- } + /// <summary> + /// <see cref="IDbDataParameter.Size"/> + /// </summary> public int Size { |
|
From: Choy R. <ch...@us...> - 2005-02-12 09:10:18
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18905/DotNetMock.Framework Modified Files: .cvsignore DotNetMock.Framework.csproj Log Message: Compile xml docs with builds. Index: DotNetMock.Framework.csproj =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/DotNetMock.Framework.csproj,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** DotNetMock.Framework.csproj 5 Feb 2005 21:12:49 -0000 1.17 --- DotNetMock.Framework.csproj 12 Feb 2005 09:10:09 -0000 1.18 *************** *** 30,34 **** ConfigurationOverrideFile = "" DefineConstants = "DEBUG;TRACE" ! DocumentationFile = "" DebugSymbols = "true" FileAlignment = "4096" --- 30,34 ---- ConfigurationOverrideFile = "" DefineConstants = "DEBUG;TRACE" ! DocumentationFile = "DotNetMock.Framework.xml" DebugSymbols = "true" FileAlignment = "4096" *************** *** 50,54 **** ConfigurationOverrideFile = "" DefineConstants = "TRACE" ! DocumentationFile = "" DebugSymbols = "false" FileAlignment = "4096" --- 50,54 ---- ConfigurationOverrideFile = "" DefineConstants = "TRACE" ! DocumentationFile = "DotNetMock.Framework.xml" DebugSymbols = "false" FileAlignment = "4096" Index: .cvsignore =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 20 Jan 2004 15:45:38 -0000 1.1 --- .cvsignore 12 Feb 2005 09:10:09 -0000 1.2 *************** *** 1,3 **** ! DotNetMock.Framework.csproj.user bin ! obj \ No newline at end of file --- 1,4 ---- ! DotNetMock.Framework.xml ! *.csproj.user bin ! obj |
|
From: Choy R. <ch...@us...> - 2005-02-12 09:08:07
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17946/DotNetMock Modified Files: .cvsignore DotNetMock.csproj Log Message: Compile xml docs with builds. Index: .cvsignore =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 20 Jan 2004 15:43:44 -0000 1.1 --- .cvsignore 12 Feb 2005 09:07:56 -0000 1.2 *************** *** 1,3 **** ! DotNetMock.csproj.user bin ! obj \ No newline at end of file --- 1,4 ---- ! DotNetMock.xml ! *.csproj.user bin ! obj Index: DotNetMock.csproj =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/DotNetMock.csproj,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** DotNetMock.csproj 5 Feb 2005 21:46:27 -0000 1.33 --- DotNetMock.csproj 12 Feb 2005 09:07:57 -0000 1.34 *************** *** 30,34 **** ConfigurationOverrideFile = "" DefineConstants = "DEBUG;TRACE" ! DocumentationFile = "bin\Debug.xml" DebugSymbols = "true" FileAlignment = "4096" --- 30,34 ---- ConfigurationOverrideFile = "" DefineConstants = "DEBUG;TRACE" ! DocumentationFile = "DotNetMock.xml" DebugSymbols = "true" FileAlignment = "4096" *************** *** 50,54 **** ConfigurationOverrideFile = "" DefineConstants = "TRACE" ! DocumentationFile = "" DebugSymbols = "false" FileAlignment = "4096" --- 50,54 ---- ConfigurationOverrideFile = "" DefineConstants = "TRACE" ! DocumentationFile = "DotNetMock.xml" DebugSymbols = "false" FileAlignment = "4096" |
|
From: Choy R. <ch...@us...> - 2005-02-12 08:54:06
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12378/DotNetMock.Framework.Tests/Data Modified Files: MockDataParameterTests.cs MockTransactionTests.cs Log Message: Get rid of some warnings from VS.NET build. Index: MockTransactionTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/Data/MockTransactionTests.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MockTransactionTests.cs 9 Oct 2004 21:14:12 -0000 1.5 --- MockTransactionTests.cs 12 Feb 2005 08:53:57 -0000 1.6 *************** *** 46,50 **** Assertion.Fail( "Should throw exception "); } ! catch ( InvalidOperationException invalidOp ) { --- 46,50 ---- Assertion.Fail( "Should throw exception "); } ! catch ( InvalidOperationException ) { *************** *** 62,66 **** Assertion.Fail( "Should throw an exception." ); } ! catch ( AssertionException assertionEx ) { --- 62,66 ---- Assertion.Fail( "Should throw an exception." ); } ! catch ( AssertionException ) { *************** *** 86,90 **** Assertion.Fail( "Should throw an exception" ); } ! catch ( InvalidOperationException invalidOp ) { --- 86,90 ---- Assertion.Fail( "Should throw an exception" ); } ! catch ( InvalidOperationException ) { *************** *** 103,107 **** Assertion.Fail( "SHould throw an exception" ); } ! catch ( InvalidOperationException invalidOp ) { --- 103,107 ---- Assertion.Fail( "SHould throw an exception" ); } ! catch ( InvalidOperationException ) { *************** *** 120,124 **** Assertion.Fail( "Should throw an exception" ); } ! catch ( AssertionException exception ) { --- 120,124 ---- Assertion.Fail( "Should throw an exception" ); } ! catch ( AssertionException ) { Index: MockDataParameterTests.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/Data/MockDataParameterTests.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MockDataParameterTests.cs 9 Oct 2004 21:14:12 -0000 1.9 --- MockDataParameterTests.cs 12 Feb 2005 08:53:57 -0000 1.10 *************** *** 103,107 **** Assertion.Fail("Should have thrown an exception."); } ! catch (AssertionException ex) { } --- 103,107 ---- Assertion.Fail("Should have thrown an exception."); } ! catch (AssertionException) { } *************** *** 113,117 **** Assertion.Fail("Should have thrown an exception."); } ! catch (AssertionException ex) { --- 113,117 ---- Assertion.Fail("Should have thrown an exception."); } ! catch (AssertionException) { |
|
From: Choy R. <ch...@us...> - 2005-02-12 08:54:06
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12378/DotNetMock.Framework/Data Modified Files: MockDbDataAdapter.cs Log Message: Get rid of some warnings from VS.NET build. Index: MockDbDataAdapter.cs =================================================================== RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDbDataAdapter.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MockDbDataAdapter.cs 1 Jan 2005 01:49:07 -0000 1.7 --- MockDbDataAdapter.cs 12 Feb 2005 08:53:57 -0000 1.8 *************** *** 79,83 **** #region Implementation of DbDataAdapter - public new event System.Data.FillErrorEventHandler FillError; protected override System.Data.Common.RowUpdatedEventArgs CreateRowUpdatedEvent(System.Data.DataRow dataRow, System.Data.IDbCommand command, System.Data.StatementType statementType, System.Data.Common.DataTableMapping tableMapping) --- 79,82 ---- |
