[Dotnetmock-commits] dotnetmock/DotNetMock Assertion.cs,1.5,1.6 DotNetMock.csproj,1.30,1.31

[Choy R. <ch...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14691/DotNetMock

Modified Files:
	Assertion.cs DotNetMock.csproj 
Log Message:
Merged changes in from branch RFE_1098585.
* Had a little trouble with the new sn -Vr stuff. I don't normally develop under administrative id. So had to added target skip-verification run as administrator. then ran tests. all pass.

Index: Assertion.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/Assertion.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Assertion.cs	9 Oct 2004 21:14:12 -0000	1.5
--- Assertion.cs	29 Jan 2005 09:13:32 -0000	1.6
***************
*** 1,14 ****
  using System;
! using System.Configuration;
! using System.Reflection;
! using System.Runtime.Remoting;
  using DotNetMock.Core;
  
  namespace DotNetMock
  {
  	/// <summary>
! 	/// Assertion class used throughout the DotNetMock framework to encapsulate specific testing frameworks.
! 	/// NOTE: All exceptions will be caught, and rethrown as DotNetMock.AssertionException. 
  	/// </summary>
  	public class Assertion
  	{
--- 1,23 ----
+ #region License
+ // Copyright (c) 2004, 2005 Griffin Caprio & Choy Rim. All rights reserved.
+ #endregion
+ #region Imports
  using System;
! 
  using DotNetMock.Core;
+ #endregion
  
  namespace DotNetMock
  {
  	/// <summary>
! 	/// Access point to underlying testing framework.
  	/// </summary>
+ 	/// <author>Griffin Caprio</author>
+ 	/// <author>Choy Rim</author>
+ 	/// <remarks>
+ 	/// Assertion class used throughout the DotNetMock framework to
+ 	/// encapsulate specific testing frameworks.
+ 	/// NOTE: All exceptions will be caught, and rethrown as DotNetMock.AssertionException. 
+ 	/// </remarks>
  	public class Assertion
  	{
***************
*** 16,40 ****
  		/// Private variable to hold concrete instance of ITestFramework interface.
  		/// </summary>
! 		private static ITestFramework _testFramework = null;
! 		/// <summary>
! 		/// Static type initializer.  Creates instance for ITestFramework from configuration file setup.
! 		/// If no configuration information is specified, defaults to NUnit.
! 		/// </summary>
! 		static Assertion()
! 		{
! 			string iTestFrameworkComponent = Environment.GetEnvironmentVariable("DotNetMock_TestingComponent");
! 			string iTestFrameworkAssembly = Environment.GetEnvironmentVariable("DotNetMock_TestingAssembly");
! 			
! 			if ( ( iTestFrameworkAssembly == null ) || ( iTestFrameworkAssembly.Equals( String.Empty ) ) ) 
! 			{
! 				iTestFrameworkAssembly = "DotNetMock.NUnit";
! 			}
! 			if ( ( iTestFrameworkComponent == null ) || ( iTestFrameworkComponent.Equals( String.Empty ) ) ) 
! 			{
! 				iTestFrameworkComponent = "DotNetMock.NUnit.NUnitTestFramework";
! 			}
! 			ObjectHandle concreteObject = Activator.CreateInstance( iTestFrameworkAssembly, iTestFrameworkComponent );
! 			_testFramework = (ITestFramework)concreteObject.Unwrap();
! 		}
  		/// <summary>
  		/// Asserts that two objects are equal.  If the objects are not equal the assertions fails with the
--- 25,31 ----
  		/// Private variable to hold concrete instance of ITestFramework interface.
  		/// </summary>
! 		private static ITestFramework _testFramework =
! 			DotNetMock.TestFramework.Implementation.Instance;
! 
  		/// <summary>
  		/// Asserts that two objects are equal.  If the objects are not equal the assertions fails with the

Index: DotNetMock.csproj
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/DotNetMock.csproj,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** DotNetMock.csproj	9 Jan 2005 06:48:35 -0000	1.30
--- DotNetMock.csproj	29 Jan 2005 09:13:32 -0000	1.31
***************
*** 40,44 ****
                      RegisterForComInterop = "false"
                      RemoveIntegerChecks = "false"
!                     TreatWarningsAsErrors = "true"
                      WarningLevel = "4"
                  />
--- 40,44 ----
                      RegisterForComInterop = "false"
                      RemoveIntegerChecks = "false"
!                     TreatWarningsAsErrors = "false"
                      WarningLevel = "4"
                  />
***************
*** 349,352 ****
--- 349,402 ----
                      BuildAction = "Compile"
                  />
+                 <File
+                     RelPath = "TestFramework\AbstractStubMaker.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TestFramework\csUnitStubMaker.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TestFramework\IDynamicLinker.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TestFramework\Implementation.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TestFramework\ImplementationFactory.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TestFramework\IStubMaker.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TestFramework\MbUnitStubMaker.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TestFramework\NUnitStubMaker.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TestFramework\StubClassBuilder.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "TestFramework\SystemDynamicLinker.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
              </Include>
          </Files>