dotnetmock-developer — For Active Developers of .NET Mock Objects

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework.Tests/ComponentModel - New directory

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/ComponentModel
In directory sc8-pr-cvs1:/tmp/cvs-serv1216/ComponentModel

Log Message:
Directory /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/ComponentModel added to the repository

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework/ComponentModel - New directory

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/ComponentModel
In directory sc8-pr-cvs1:/tmp/cvs-serv980/ComponentModel

Log Message:
Directory /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/ComponentModel added to the repository

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework/Data MockDataParameter.cs,1.4,1.5 MockDataParameterCollection.cs,1.8,1.9

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv20315/DotNetMock.Framework/Data

Modified Files:
	MockDataParameter.cs MockDataParameterCollection.cs 
Log Message:
1) Added Stephen Bodnar's changes to MockDataParameter & MockDataParameterCollection, and tests.

Index: MockDataParameter.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDataParameter.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MockDataParameter.cs	1 Apr 2003 01:43:57 -0000	1.4
--- MockDataParameter.cs	5 May 2003 01:42:04 -0000	1.5
***************
*** 83,90 ****
  		/// <param name="name">Name for the new parameter</param>
  		/// <param name="value">Value for the new parameter</param>
! 		public MockDataParameter(string name, string value) 
  		{
  			_parameterName.Actual = name;
  			_parameterValue.Actual = value;
  		}
  		/// <summary>
--- 83,91 ----
  		/// <param name="name">Name for the new parameter</param>
  		/// <param name="value">Value for the new parameter</param>
! 		public MockDataParameter(string name, Object value) 
  		{
  			_parameterName.Actual = name;
  			_parameterValue.Actual = value;
+ 			_parameterType.Actual = inferType(value);
  		}
  		/// <summary>
***************
*** 113,117 ****
  		/// </summary>
  		/// <param name="value">Value to expect</param>
! 		public void SetExpectedValue(string value)
  		{
  			_parameterValue.Expected = value;
--- 114,118 ----
  		/// </summary>
  		/// <param name="value">Value to expect</param>
! 		public void SetExpectedValue(Object value)
  		{
  			_parameterValue.Expected = value;

Index: MockDataParameterCollection.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDataParameterCollection.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MockDataParameterCollection.cs	21 Apr 2003 17:16:39 -0000	1.8
--- MockDataParameterCollection.cs	5 May 2003 01:42:05 -0000	1.9
***************
*** 60,64 ****
  	/// This is a Mock Object that implements the IDataParameterCollection interface.  It holds a collection of IDataParamter objects.
  	/// </summary>
! 	public class MockDataParameterCollection : CollectionBase, IMockObject, IDataParameterCollection
  	{
  		/// <summary>
--- 60,64 ----
  	/// This is a Mock Object that implements the IDataParameterCollection interface.  It holds a collection of IDataParamter objects.
  	/// </summary>
! 	public class MockDataParameterCollection : MockObject, IDataParameterCollection
  	{
  		/// <summary>
***************
*** 173,177 ****
  		/// </summary>
  		/// <param name="index">Index to remove</param>
! 		public new void RemoveAt(int index)
  		{
  			_actualCollection.RemoveAt(index);
--- 173,177 ----
  		/// </summary>
  		/// <param name="index">Index to remove</param>
! 		public void RemoveAt(int index)
  		{
  			_actualCollection.RemoveAt(index);
***************
*** 206,210 ****
  		/// Clears Actual Collection
  		/// </summary>
! 		public new void Clear()
  		{
  			_actualCollection.Clear();
--- 206,210 ----
  		/// Clears Actual Collection
  		/// </summary>
! 		public void Clear()
  		{
  			_actualCollection.Clear();
***************
*** 280,288 ****
  		/// Provides zero-based index access to the collection.
  		/// </summary>
! 		public IDataParameter this[int index]
  		{
  			get
  			{
! 				return (IDataParameter)_actualCollection[index];
  			}
  			set
--- 280,288 ----
  		/// Provides zero-based index access to the collection.
  		/// </summary>
! 		public object this[int index]
  		{
  			get
  			{
! 				return (object)_actualCollection[index];
  			}
  			set
***************
*** 320,324 ****
  		/// Gets count of collection
  		/// </summary>
! 		public new int Count
  		{
  			get
--- 320,324 ----
  		/// Gets count of collection
  		/// </summary>
! 		public int Count
  		{
  			get
***************
*** 356,360 ****
  		/// </summary>
  		/// <returns></returns>
! 		public new System.Collections.IEnumerator GetEnumerator()
  		{
  			return _actualCollection.GetEnumerator();
--- 356,360 ----
  		/// </summary>
  		/// <returns></returns>
! 		public System.Collections.IEnumerator GetEnumerator()
  		{
  			return _actualCollection.GetEnumerator();
***************
*** 362,366 ****
  		#endregion
  		#region MockObject overrides
! 		public void Verify()
  		{
  			if (_expectedCollection.Count > _actualCollection.Count) 
--- 362,366 ----
  		#endregion
  		#region MockObject overrides
! 		public override void Verify()
  		{
  			if (_expectedCollection.Count > _actualCollection.Count) 
***************
*** 379,383 ****
  				verify.SetExpectedSourceColumn( expected.SourceColumn );
  				verify.SetExpectedType( expected.DbType );
! 				verify.SetExpectedValue( expected.Value.ToString() );
  
  				verify.ParameterName = actual.ParameterName;
--- 379,383 ----
  				verify.SetExpectedSourceColumn( expected.SourceColumn );
  				verify.SetExpectedType( expected.DbType );
! 				verify.SetExpectedValue( expected.Value );
  
  				verify.ParameterName = actual.ParameterName;
***************
*** 391,410 ****
  		}
  		#endregion
- 
- 		public void NotImplemented(string methodName)
- 		{
- 			throw new NotImplementedException( methodName + " is currently not implemented." );
- 		}
- 
- 		public string MockName
- 		{
- 			get
- 			{
- 				return "MockDataParamterCollection";
- 			}
- 			set
- 			{
- 			}
- 		}
  
  	}
--- 391,394 ----

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework.Tests/Data MockDataParameterCollectionTests.cs,1.3,1.4 MockDataParameterTests.cs,1.2,1.3

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv20315/DotNetMock.Framework.Tests/Data

Modified Files:
	MockDataParameterCollectionTests.cs MockDataParameterTests.cs 
Log Message:
1) Added Stephen Bodnar's changes to MockDataParameter & MockDataParameterCollection, and tests.

Index: MockDataParameterCollectionTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/Data/MockDataParameterCollectionTests.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MockDataParameterCollectionTests.cs	26 Mar 2003 03:14:49 -0000	1.3
--- MockDataParameterCollectionTests.cs	5 May 2003 01:42:05 -0000	1.4
***************
*** 4,7 ****
--- 4,8 ----
  using DotNetMock.Framework.Data;
  using System.Data;
+ using System.Data.SqlClient;
  
  namespace DotNetMock.Tests.Data
***************
*** 33,36 ****
--- 34,79 ----
  			_mockDataParameterCollection.Verify();
  		}
+ 
+ 		[Test]
+ 		public void AddParameterWithValueAsInt()
+ 		{
+ 			MockDataParameter mockDP1 = new MockDataParameter("@inpID", 123456);
+ 			
+ 			_mockDataParameterCollection.AddExpected(mockDP1);
+ 			_mockDataParameterCollection.Add(mockDP1);
+ 			_mockDataParameterCollection.Verify();
+ 		}
+ 
+ 		[Test]
+ 		[ExpectedException(typeof(AssertionException))]
+ 		public void AddParameterWithUnexpectedType()
+ 		{
+ 			MockDataParameter mockDP1 = new MockDataParameter("@inpID", 123456);
+ 			MockDataParameter mockDP2 = new MockDataParameter("@inpID", "123456");
+ 			
+ 			_mockDataParameterCollection.AddExpected(mockDP1);
+ 			_mockDataParameterCollection.Add(mockDP2);
+ 			_mockDataParameterCollection.Verify();
+ 		}
+ 
+ 		[Test]
+ 		public void TestToExposeTheMockDataParameterDefaultTypeProblem()
+ 		{
+ 			MockDataParameter pageSizeParam = new MockDataParameter("@pageSize", 5);
+ 			pageSizeParam.SetExpectedType(DbType.Int32);
+ 
+ 			MockCommand command = new MockCommand();
+ 			command.SetExpectedParameter(pageSizeParam);
+ 			
+ 			MockDbConnection con = new MockDbConnection();
+ 			con.SetExpectedCommand(command);
+ 			
+ 			IDbCommand com = con.CreateCommand();
+ 			IDataParameter realPageSizeParam = new SqlParameter("@pageSize", 5);
+ 			com.Parameters.Add(realPageSizeParam);
+ 			
+ 			command.Parameters.Verify();
+ 		}
+ 
  		[Test]
  		public void AddMultipleParameters()

Index: MockDataParameterTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/Data/MockDataParameterTests.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MockDataParameterTests.cs	11 Mar 2003 22:45:41 -0000	1.2
--- MockDataParameterTests.cs	5 May 2003 01:42:05 -0000	1.3
***************
*** 42,45 ****
--- 42,72 ----
  
  		[Test]
+ 		public void ConstructorNameValueForInt()
+ 		{
+ 			_mockDataParameter = new MockDataParameter("@inpID", 123456);
+ 
+ 			_mockDataParameter.SetExpectedValue(123456);
+ 			_mockDataParameter.Verify();
+ 		}
+ 
+ 		[Test]
+ 		public void InferTypeMockDataParameter()
+ 		{
+ 			_mockDataParameter = new MockDataParameter("@inpID", 123456);
+ 			
+ 			Assertion.AssertEquals(DbType.Int32, _mockDataParameter.DbType);
+ 		}
+ 
+ 		[Test]
+ 		[ExpectedException(typeof(AssertionException))]
+ 		public void ConstructorNameValueForIntInvalid()
+ 		{
+ 			_mockDataParameter = new MockDataParameter("@inpID", "123456");
+ 
+ 			_mockDataParameter.SetExpectedValue(123456);
+ 			_mockDataParameter.Verify();
+ 		}
+ 
+ 		[Test]
  		[ExpectedException(typeof(AssertionException))]
  		public void ConstructorNameValue()
***************
*** 58,61 ****
--- 85,89 ----
  			_mockDataParameter.Verify();
  		}
+ 
  		[Test]
  		public void ConstructorNameTypeSourceColumn()
***************
*** 120,121 ****
--- 148,150 ----
  	}
  }
+ 

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework DotNetMock.Framework.csproj,1.6,1.7

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework
In directory sc8-pr-cvs1:/tmp/cvs-serv20315/DotNetMock.Framework

Modified Files:
	DotNetMock.Framework.csproj 
Log Message:
1) Added Stephen Bodnar's changes to MockDataParameter & MockDataParameterCollection, and tests.

Index: DotNetMock.Framework.csproj
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/DotNetMock.Framework.csproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DotNetMock.Framework.csproj	7 Apr 2003 00:43:57 -0000	1.6
--- DotNetMock.Framework.csproj	5 May 2003 01:42:04 -0000	1.7
***************
*** 98,101 ****
--- 98,106 ----
                  />
                  <File
+                     RelPath = "Data\MockDataAdapter.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Data\MockDataParameter.cs"
                      SubType = "Code"

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework/Data MockDataParameterCollection.cs,1.7,1.8

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv28808/DotNetMock.Framework/Data

Modified Files:
	MockDataParameterCollection.cs 
Log Message:
Derived from CollectionBase

Index: MockDataParameterCollection.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDataParameterCollection.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MockDataParameterCollection.cs	21 Apr 2003 16:58:44 -0000	1.7
--- MockDataParameterCollection.cs	21 Apr 2003 17:16:39 -0000	1.8
***************
*** 60,64 ****
  	/// This is a Mock Object that implements the IDataParameterCollection interface.  It holds a collection of IDataParamter objects.
  	/// </summary>
! 	public class MockDataParameterCollection : MockObject, IDataParameterCollection
  	{
  		/// <summary>
--- 60,64 ----
  	/// This is a Mock Object that implements the IDataParameterCollection interface.  It holds a collection of IDataParamter objects.
  	/// </summary>
! 	public class MockDataParameterCollection : CollectionBase, IMockObject, IDataParameterCollection
  	{
  		/// <summary>
***************
*** 173,177 ****
  		/// </summary>
  		/// <param name="index">Index to remove</param>
! 		public void RemoveAt(int index)
  		{
  			_actualCollection.RemoveAt(index);
--- 173,177 ----
  		/// </summary>
  		/// <param name="index">Index to remove</param>
! 		public new void RemoveAt(int index)
  		{
  			_actualCollection.RemoveAt(index);
***************
*** 206,210 ****
  		/// Clears Actual Collection
  		/// </summary>
! 		public void Clear()
  		{
  			_actualCollection.Clear();
--- 206,210 ----
  		/// Clears Actual Collection
  		/// </summary>
! 		public new void Clear()
  		{
  			_actualCollection.Clear();
***************
*** 280,292 ****
  		/// Provides zero-based index access to the collection.
  		/// </summary>
! 		public object this[int index]
  		{
  			get
  			{
! 				return _actualCollection[index];
  			}
  			set
  			{
! 				_actualCollection[index] = value;
  			}
  		}
--- 280,292 ----
  		/// Provides zero-based index access to the collection.
  		/// </summary>
! 		public IDataParameter this[int index]
  		{
  			get
  			{
! 				return (IDataParameter)_actualCollection[index];
  			}
  			set
  			{
! 				_actualCollection[index] = (IDataParameter)value;
  			}
  		}
***************
*** 320,324 ****
  		/// Gets count of collection
  		/// </summary>
! 		public int Count
  		{
  			get
--- 320,324 ----
  		/// Gets count of collection
  		/// </summary>
! 		public new int Count
  		{
  			get
***************
*** 356,360 ****
  		/// </summary>
  		/// <returns></returns>
! 		public System.Collections.IEnumerator GetEnumerator()
  		{
  			return _actualCollection.GetEnumerator();
--- 356,360 ----
  		/// </summary>
  		/// <returns></returns>
! 		public new System.Collections.IEnumerator GetEnumerator()
  		{
  			return _actualCollection.GetEnumerator();
***************
*** 362,366 ****
  		#endregion
  		#region MockObject overrides
! 		public override void Verify()
  		{
  			if (_expectedCollection.Count > _actualCollection.Count) 
--- 362,366 ----
  		#endregion
  		#region MockObject overrides
! 		public void Verify()
  		{
  			if (_expectedCollection.Count > _actualCollection.Count) 
***************
*** 391,394 ****
--- 391,410 ----
  		}
  		#endregion
+ 
+ 		public void NotImplemented(string methodName)
+ 		{
+ 			throw new NotImplementedException( methodName + " is currently not implemented." );
+ 		}
+ 
+ 		public string MockName
+ 		{
+ 			get
+ 			{
+ 				return "MockDataParamterCollection";
+ 			}
+ 			set
+ 			{
+ 			}
+ 		}
  
  	}

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework/Data MockDataParameterCollection.cs,1.6,1.7

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv9855/DotNetMock.Framework/Data

Modified Files:
	MockDataParameterCollection.cs 
Log Message:


Index: MockDataParameterCollection.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDataParameterCollection.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MockDataParameterCollection.cs	21 Apr 2003 16:52:35 -0000	1.6
--- MockDataParameterCollection.cs	21 Apr 2003 16:58:44 -0000	1.7
***************
*** 159,167 ****
  			get
  			{
! 				return (IDataParameter)_actualCollection[IndexOf(parameterName)];
  			}
  			set
  			{
! 				_actualCollection[IndexOf(parameterName)] = (IDataParameter)value;
  			}
  		}
--- 159,167 ----
  			get
  			{
! 				return _actualCollection[IndexOf(parameterName)];
  			}
  			set
  			{
! 				_actualCollection[IndexOf(parameterName)] = value;
  			}
  		}
***************
*** 284,292 ****
  			get
  			{
! 				return (IDataParameter)_actualCollection[index];
  			}
  			set
  			{
! 				_actualCollection[index] = (IDataParameter)value;
  			}
  		}
--- 284,292 ----
  			get
  			{
! 				return _actualCollection[index];
  			}
  			set
  			{
! 				_actualCollection[index] = value;
  			}
  		}

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework/Data MockDataParameterCollection.cs,1.5,1.6

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv3096/DotNetMock.Framework/Data

Modified Files:
	MockDataParameterCollection.cs 
Log Message:


Index: MockDataParameterCollection.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDataParameterCollection.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MockDataParameterCollection.cs	8 Apr 2003 04:27:11 -0000	1.5
--- MockDataParameterCollection.cs	21 Apr 2003 16:52:35 -0000	1.6
***************
*** 159,167 ****
  			get
  			{
! 				return _actualCollection[IndexOf(parameterName)];
  			}
  			set
  			{
! 				_actualCollection[IndexOf(parameterName)] = value;
  			}
  		}
--- 159,167 ----
  			get
  			{
! 				return (IDataParameter)_actualCollection[IndexOf(parameterName)];
  			}
  			set
  			{
! 				_actualCollection[IndexOf(parameterName)] = (IDataParameter)value;
  			}
  		}
***************
*** 284,288 ****
  			get
  			{
! 				return (object)_actualCollection[index];
  			}
  			set
--- 284,288 ----
  			get
  			{
! 				return (IDataParameter)_actualCollection[index];
  			}
  			set

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework/Data MockDbConnection.cs,1.4,1.5

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv25325/DotNetMock.Framework/Data

Modified Files:
	MockDbConnection.cs 
Log Message:
Fixed Closed Bug

Index: MockDbConnection.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDbConnection.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MockDbConnection.cs	18 Apr 2003 19:31:55 -0000	1.4
--- MockDbConnection.cs	18 Apr 2003 19:34:58 -0000	1.5
***************
*** 213,216 ****
--- 213,217 ----
  		{
  			_closeCalls.Inc();
+ 			_connectionState = ConnectionState.Closed;
  		}
  		/// <summary>

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework/Data MockDbConnection.cs,1.3,1.4

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv23836/DotNetMock.Framework/Data

Modified Files:
	MockDbConnection.cs 
Log Message:
Fixed Open bug

Index: MockDbConnection.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDbConnection.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MockDbConnection.cs	1 Apr 2003 01:43:57 -0000	1.3
--- MockDbConnection.cs	18 Apr 2003 19:31:55 -0000	1.4
***************
*** 205,208 ****
--- 205,209 ----
  		{
  			_openCalls.Inc();
+ 			_connectionState = ConnectionState.Open;
  		}
  		/// <summary>

[Dotnetmock-developer] dotnetmock DotNetMock.Master.build,1.9,1.10

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock
In directory sc8-pr-cvs1:/tmp/cvs-serv22054

Modified Files:
	DotNetMock.Master.build 
Log Message:
Merged from branch Release-0_4_1

Index: DotNetMock.Master.build
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Master.build,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DotNetMock.Master.build	7 Apr 2003 00:43:56 -0000	1.9
--- DotNetMock.Master.build	14 Apr 2003 03:48:56 -0000	1.10
***************
*** 128,132 ****
  		<copy file="${build.dir}/docs/MSDN/DotNetMock.chm" todir="${package.dir}/doc"/>
  	</target>
! 	<target name="InstallTemplates" description="Installs VS.NET Templates for Mock Objects and NUnit Tests">
  		<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"/>
--- 128,132 ----
  		<copy file="${build.dir}/docs/MSDN/DotNetMock.chm" todir="${package.dir}/doc"/>
  	</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"/>

[Dotnetmock-developer] dotnetmock DotNetMock.Master.build,1.9,1.9.2.1

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock
In directory sc8-pr-cvs1:/tmp/cvs-serv19923

Modified Files:
      Tag: Release-0_4_1
	DotNetMock.Master.build 
Log Message:
Testing Branching

Index: DotNetMock.Master.build
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Master.build,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** DotNetMock.Master.build	7 Apr 2003 00:43:56 -0000	1.9
--- DotNetMock.Master.build	14 Apr 2003 03:44:51 -0000	1.9.2.1
***************
*** 128,132 ****
  		<copy file="${build.dir}/docs/MSDN/DotNetMock.chm" todir="${package.dir}/doc"/>
  	</target>
! 	<target name="InstallTemplates" description="Installs VS.NET Templates for Mock Objects and NUnit Tests">
  		<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"/>
--- 128,132 ----
  		<copy file="${build.dir}/docs/MSDN/DotNetMock.chm" todir="${package.dir}/doc"/>
  	</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"/>

[Dotnetmock-developer] DotNetMock 0.4 Released

[Griffin C. <gri...@ya...>]

Hello all!

This is a announcement of the new DotNetMock has been
released, version 0.4.  Below is the change log:

MockObject.cs - Marked Fail(), AssertTrue(),
AssertEquals() Obsolete

MockObject.cs - Added MockName Property for name
variable

MockObject.cs - Changed to implement IMockObject
interface

NullObject.cs - Added Name property for name variable

IMockObject.cs - Added IMockObject interface for
custom MockObjects

MockDataReader.cs - Fixed indexing bug

MockDataParameterCollection - Fixed Verify() bug

AbstractExpectationCollection.cs - Fixed ClearActual()
bug.  was really ClearExpected()

MockDbConnection.cs - State, ConnectionTimeout, &
Command setups were fixed

MockXPathNodeIterator.cs - Added XPathNodeIterator

MockXPathDocument.cs - Added XPathDocument

MockXPathNodeIterator.cs - Added XPathNodeIterator

IMockObject.cs - Changed className to methodName in
NotImplemented()

MockXPathNavigator.cs - Added XPathNavigator

Added VisualStudioTemplates for C#

MockDataParameterCollection.cs - Changed Verify()
method to not fail for no expected parameters.

ExpectationCounter.cs - Changed Verify() method to
only Verify if the object HasExpectations

Plus other minor fixes....

Check it out if you get a chance and throw some
feedback my way if you get a chance.

Thanks,
Griffin

=====
Griffin Caprio 
"Your child against mine.  The winner
will be hailed, the loser will be booed
until my throat hurts!" - Homer Simpson to Marge

__________________________________________________
Do you Yahoo!?
Yahoo! Tax Center - File online, calculators, forms, and more
http://tax.yahoo.com

[Dotnetmock-developer] dotnetmock/DotNetMock.Tests ExpectationCounterTests.cs,1.3,1.4

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests
In directory sc8-pr-cvs1:/tmp/cvs-serv9344/DotNetMock.Tests

Modified Files:
	ExpectationCounterTests.cs 
Log Message:
1) Updated VS.NET Solution
2) Updated ExpectationCounter.cs
3) Updated MockDataParameterCOllection.cs


Index: ExpectationCounterTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ExpectationCounterTests.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ExpectationCounterTests.cs	1 Apr 2003 01:43:58 -0000	1.3
--- ExpectationCounterTests.cs	8 Apr 2003 04:27:11 -0000	1.4
***************
*** 83,86 ****
--- 83,87 ----
  			_counter.Inc();
  			Assertion.Assert("Should have no expectations", !_counter.HasExpectations);
+ 			_counter.Verify();
  		}
  		

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework.Tests/Data MockCommandTests.cs,1.3,1.4

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv9344/DotNetMock.Framework.Tests/Data

Modified Files:
	MockCommandTests.cs 
Log Message:
1) Updated VS.NET Solution
2) Updated ExpectationCounter.cs
3) Updated MockDataParameterCOllection.cs


Index: MockCommandTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/Data/MockCommandTests.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MockCommandTests.cs	26 Mar 2003 03:14:49 -0000	1.3
--- MockCommandTests.cs	8 Apr 2003 04:27:11 -0000	1.4
***************
*** 60,65 ****
  		}
  		[Test]
! 		[ExpectedException(typeof(NotImplementedException))]
! 		public void InValidCommandTypeProperty()
  		{
  			_mockCmd = new MockCommand();
--- 60,64 ----
  		}
  		[Test]
! 		public void CommandTypePropertySP()
  		{
  			_mockCmd = new MockCommand();
***************
*** 118,121 ****
--- 117,135 ----
  			_mockCmd.SetExpectedExecuteCalls(2);
  			_mockCmd.ExecuteNonQuery();
+ 			_mockCmd.Verify();
+ 		}
+ 		[Test]
+ 		public void CreateCallsException()
+ 		{
+ 			_mockCmd = new MockCommand();
+ 			_mockCmd.SetExecuteException( new Exception() );
+ 			_mockCmd.SetExpectedExecuteCalls( 1 );
+ 			try 
+ 			{
+ 				_mockCmd.ExecuteNonQuery();
+ 				Assertion.Fail("Should have thrown an exception.");
+ 			}
+ 			catch {}
+ 
  			_mockCmd.Verify();
  		}

[Dotnetmock-developer] dotnetmock/DotNetMock AbstractExpectationCollection.cs,1.8,1.9 ExpectationCounter.cs,1.9,1.10

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock
In directory sc8-pr-cvs1:/tmp/cvs-serv9344/DotNetMock

Modified Files:
	AbstractExpectationCollection.cs ExpectationCounter.cs 
Log Message:
1) Updated VS.NET Solution
2) Updated ExpectationCounter.cs
3) Updated MockDataParameterCOllection.cs


Index: AbstractExpectationCollection.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/AbstractExpectationCollection.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AbstractExpectationCollection.cs	1 Apr 2003 01:43:56 -0000	1.8
--- AbstractExpectationCollection.cs	8 Apr 2003 04:27:10 -0000	1.9
***************
*** 193,200 ****
  		public override void Verify()
  		{
! 			NUnit.Framework.Assertion.AssertEquals("Expectation Count's do not equal.", this.ExpectedCollection.Count, this.ActualCollection.Count);
! 			for (int i = 0; i < this.ActualCollection.Count; i++)
  			{
! 				NUnit.Framework.Assertion.AssertEquals("Collection items not equal at index " + i, this.ExpectedCollection[i].ToString(), this.ActualCollection[i].ToString());
  			}
  		}
--- 193,203 ----
  		public override void Verify()
  		{
! 			if (this.HasExpectations) 
  			{
! 				NUnit.Framework.Assertion.AssertEquals("Expectation Count's do not equal.", this.ExpectedCollection.Count, this.ActualCollection.Count);
! 				for (int i = 0; i < this.ActualCollection.Count; i++)
! 				{
! 					NUnit.Framework.Assertion.AssertEquals("Collection items not equal at index " + i, this.ExpectedCollection[i].ToString(), this.ActualCollection[i].ToString());
! 				}
  			}
  		}

Index: ExpectationCounter.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/ExpectationCounter.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ExpectationCounter.cs	1 Apr 2003 01:43:56 -0000	1.9
--- ExpectationCounter.cs	8 Apr 2003 04:27:11 -0000	1.10
***************
*** 91,96 ****
  		/// Verifies object.
  		/// </summary>
! 		public override void Verify() {
! 			Assertion.AssertEquals("Did not receive the expected Count for object " + this.name, this._expectedCalls, this._actualCalls);
  		}
  		/// <summary>
--- 91,100 ----
  		/// Verifies object.
  		/// </summary>
! 		public override void Verify() 
! 		{
! 			if (this.HasExpectations)
! 			{
! 				Assertion.AssertEquals("Did not receive the expected Count for object " + this.name, this._expectedCalls, this._actualCalls);
! 			}
  		}
  		/// <summary>

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework/Data MockCommand.cs,1.4,1.5 MockDataParameterCollection.cs,1.4,1.5

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv9344/DotNetMock.Framework/Data

Modified Files:
	MockCommand.cs MockDataParameterCollection.cs 
Log Message:
1) Updated VS.NET Solution
2) Updated ExpectationCounter.cs
3) Updated MockDataParameterCOllection.cs


Index: MockCommand.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockCommand.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MockCommand.cs	1 Apr 2003 01:43:57 -0000	1.4
--- MockCommand.cs	8 Apr 2003 04:27:11 -0000	1.5
***************
*** 236,243 ****
  			set
  			{
- 				if (!value.Equals(CommandType.Text))
- 				{
- 					throw new NotImplementedException("Only CommandType.Text is currently supported.");
- 				}
  				_commandType.Actual = value;
  			}
--- 236,239 ----

Index: MockDataParameterCollection.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDataParameterCollection.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MockDataParameterCollection.cs	1 Apr 2003 01:43:57 -0000	1.4
--- MockDataParameterCollection.cs	8 Apr 2003 04:27:11 -0000	1.5
***************
*** 364,373 ****
  		public override void Verify()
  		{
! 			if (_expectedCollection.Count != _actualCollection.Count) 
  			{
! 				Assertion.Fail("Expected Parameters count does not equal Actual Parameters count.");
  			}
  			
! 			for (int i = 0; i < _actualCollection.Count; i++)
  			{
  				MockDataParameter verify = new MockDataParameter();
--- 364,373 ----
  		public override void Verify()
  		{
! 			if (_expectedCollection.Count > _actualCollection.Count) 
  			{
! 				Assertion.Fail("Expected Parameters count" + _expectedCollection.Count + " does not equal Actual Parameters count " + _actualCollection.Count);
  			}
  			
! 			for (int i = 0; i < _expectedCollection.Count; i++)
  			{
  				MockDataParameter verify = new MockDataParameter();

[Dotnetmock-developer] dotnetmock DotNetMock.sln,1.6,1.7

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock
In directory sc8-pr-cvs1:/tmp/cvs-serv9344

Modified Files:
	DotNetMock.sln 
Log Message:
1) Updated VS.NET Solution
2) Updated ExpectationCounter.cs
3) Updated MockDataParameterCOllection.cs


Index: DotNetMock.sln
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.sln,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DotNetMock.sln	7 Apr 2003 00:43:56 -0000	1.6
--- DotNetMock.sln	8 Apr 2003 04:27:10 -0000	1.7
***************
*** 4,7 ****
--- 4,13 ----
  Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetMock.Framework.Tests", "DotNetMock.Framework.Tests\DotNetMock.Framework.Tests.csproj", "{32FE638B-E5ED-4886-8F1B-5E35AE6289A5}"
  EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetMock", "DotNetMock\DotNetMock.csproj", "{1AD0CD00-16FA-4456-B2ED-A47406957228}"
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetMock.Tests", "DotNetMock.Tests\DotNetMock.Tests.csproj", "{0FBE418F-86AF-4E83-B66F-C0177CE582BC}"
+ EndProject
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetMock.Examples", "DotNetMock.Examples\DotNetMock.Examples.csproj", "{80B98B32-57CB-4989-B506-0F2B0AD94DBA}"
+ EndProject
  Global
  	GlobalSection(SolutionConfiguration) = preSolution
***************
*** 20,23 ****
--- 26,41 ----
  		{32FE638B-E5ED-4886-8F1B-5E35AE6289A5}.Release.ActiveCfg = Release|.NET
  		{32FE638B-E5ED-4886-8F1B-5E35AE6289A5}.Release.Build.0 = Release|.NET
+ 		{1AD0CD00-16FA-4456-B2ED-A47406957228}.Debug.ActiveCfg = Debug|.NET
+ 		{1AD0CD00-16FA-4456-B2ED-A47406957228}.Debug.Build.0 = Debug|.NET
+ 		{1AD0CD00-16FA-4456-B2ED-A47406957228}.Release.ActiveCfg = Release|.NET
+ 		{1AD0CD00-16FA-4456-B2ED-A47406957228}.Release.Build.0 = Release|.NET
+ 		{0FBE418F-86AF-4E83-B66F-C0177CE582BC}.Debug.ActiveCfg = Debug|.NET
+ 		{0FBE418F-86AF-4E83-B66F-C0177CE582BC}.Debug.Build.0 = Debug|.NET
+ 		{0FBE418F-86AF-4E83-B66F-C0177CE582BC}.Release.ActiveCfg = Release|.NET
+ 		{0FBE418F-86AF-4E83-B66F-C0177CE582BC}.Release.Build.0 = Release|.NET
+ 		{80B98B32-57CB-4989-B506-0F2B0AD94DBA}.Debug.ActiveCfg = Debug|.NET
+ 		{80B98B32-57CB-4989-B506-0F2B0AD94DBA}.Debug.Build.0 = Debug|.NET
+ 		{80B98B32-57CB-4989-B506-0F2B0AD94DBA}.Release.ActiveCfg = Release|.NET
+ 		{80B98B32-57CB-4989-B506-0F2B0AD94DBA}.Release.Build.0 = Release|.NET
  	EndGlobalSection
  	GlobalSection(ExtensibilityGlobals) = postSolution

[Dotnetmock-developer] dotnetmock DotNetMock.Master.build,1.8,1.9 DotNetMock.sln,1.5,1.6

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock
In directory sc8-pr-cvs1:/tmp/cvs-serv23859

Modified Files:
	DotNetMock.Master.build DotNetMock.sln 
Log Message:
Added Mock Objects for System.Xml.XPath namespace: XPathDocument, XPathNavigator, XPathNodeIterator
Added MockObject & NUnitTest wizards
Added nunit.framework.dll to distribution
Fixed Master build install of VisualStudioTemplates
Added various comments and XML documentation to various classes


Index: DotNetMock.Master.build
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Master.build,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DotNetMock.Master.build	25 Mar 2003 02:39:56 -0000	1.8
--- DotNetMock.Master.build	7 Apr 2003 00:43:56 -0000	1.9
***************
*** 1,3 ****
- 		
  <project name=".NET Mock Objects master build file">
  	<description>Master build file for .NET Mock Objects project</description>
--- 1,2 ----
***************
*** 131,138 ****
  	<target name="InstallTemplates" description="Installs VS.NET Templates for Mock Objects and NUnit Tests">
  		<readregistry property="wizards.dir" key="SOFTWARE\Microsoft\VisualStudio\7.0\Projects\{FAE04EC0-301F-11d3-BF4B-00C04F79EFBC}\WizardsTemplatesDir" hive="LocalMachine"/>
! 		<readregistry property="projects.dir" key="SOFTWARE\Microsoft\VisualStudio\7.0\Projects\{FAE04EC0-301F-11d3-BF4B-00C04F79EFBC}\ProjectTemplatesDir" hive="LocalMachine"/>
! 		<copy todir="${projects.dir}">
  			<fileset basedir="${VisualStudioTemplates}/CSharpProjectItems">
  				<includes name="**/*.vsz"/>
  			</fileset>
  		</copy>
--- 130,142 ----
  	<target name="InstallTemplates" description="Installs VS.NET Templates for Mock Objects and NUnit Tests">
  		<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>

Index: DotNetMock.sln
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.sln,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DotNetMock.sln	11 Mar 2003 20:30:43 -0000	1.5
--- DotNetMock.sln	7 Apr 2003 00:43:56 -0000	1.6
***************
*** 1,9 ****
  Microsoft Visual Studio Solution File, Format Version 7.00
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetMock", "DotNetMock\DotNetMock.csproj", "{1AD0CD00-16FA-4456-B2ED-A47406957228}"
- EndProject
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetMock.Tests", "DotNetMock.Tests\DotNetMock.Tests.csproj", "{0FBE418F-86AF-4E83-B66F-C0177CE582BC}"
- EndProject
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetMock.Examples", "DotNetMock.Examples\DotNetMock.Examples.csproj", "{80B98B32-57CB-4989-B506-0F2B0AD94DBA}"
- EndProject
  Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetMock.Framework", "DotNetMock.Framework\DotNetMock.Framework.csproj", "{514DAB7F-4A05-4343-9BF5-2C3DC60A431D}"
  EndProject
--- 1,3 ----
***************
*** 18,33 ****
  	EndGlobalSection
  	GlobalSection(ProjectConfiguration) = postSolution
- 		{1AD0CD00-16FA-4456-B2ED-A47406957228}.Debug.ActiveCfg = Debug|.NET
- 		{1AD0CD00-16FA-4456-B2ED-A47406957228}.Debug.Build.0 = Debug|.NET
- 		{1AD0CD00-16FA-4456-B2ED-A47406957228}.Release.ActiveCfg = Release|.NET
- 		{1AD0CD00-16FA-4456-B2ED-A47406957228}.Release.Build.0 = Release|.NET
- 		{0FBE418F-86AF-4E83-B66F-C0177CE582BC}.Debug.ActiveCfg = Debug|.NET
- 		{0FBE418F-86AF-4E83-B66F-C0177CE582BC}.Debug.Build.0 = Debug|.NET
- 		{0FBE418F-86AF-4E83-B66F-C0177CE582BC}.Release.ActiveCfg = Release|.NET
- 		{0FBE418F-86AF-4E83-B66F-C0177CE582BC}.Release.Build.0 = Release|.NET
- 		{80B98B32-57CB-4989-B506-0F2B0AD94DBA}.Debug.ActiveCfg = Debug|.NET
- 		{80B98B32-57CB-4989-B506-0F2B0AD94DBA}.Debug.Build.0 = Debug|.NET
- 		{80B98B32-57CB-4989-B506-0F2B0AD94DBA}.Release.ActiveCfg = Release|.NET
- 		{80B98B32-57CB-4989-B506-0F2B0AD94DBA}.Release.Build.0 = Release|.NET
  		{514DAB7F-4A05-4343-9BF5-2C3DC60A431D}.Debug.ActiveCfg = Debug|.NET
  		{514DAB7F-4A05-4343-9BF5-2C3DC60A431D}.Debug.Build.0 = Debug|.NET
--- 12,15 ----

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework.Tests/Xml/XPath MockXPathDocumentTests.cs,NONE,1.1 MockXPathNavigatorTests.cs,NONE,1.1 MockXPathNodeIteratorTests.cs,NONE,1.1

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/Xml/XPath
In directory sc8-pr-cvs1:/tmp/cvs-serv23859/DotNetMock.Framework.Tests/Xml/XPath

Added Files:
	MockXPathDocumentTests.cs MockXPathNavigatorTests.cs 
	MockXPathNodeIteratorTests.cs 
Log Message:
Added Mock Objects for System.Xml.XPath namespace: XPathDocument, XPathNavigator, XPathNodeIterator
Added MockObject & NUnitTest wizards
Added nunit.framework.dll to distribution
Fixed Master build install of VisualStudioTemplates
Added various comments and XML documentation to various classes


--- NEW FILE: MockXPathDocumentTests.cs ---
using System;
using System.Xml;
using System.Xml.XPath;
using NUnit.Framework;
using DotNetMock.Framework.Xml.XPath;

namespace DotNetMock.Tests.Xml.XPath
{
	[TestFixture]
	public class MockXPathDocumentTests
	{
		private class TestXPathNavigator : XPathNavigator 
		{
			
			public override string BaseURI
			{
				get
				{
					return null;
				}
			}

			public override System.Xml.XPath.XPathNavigator Clone()
			{
				return null;
			}

			public override string GetAttribute(string localName, string namespaceURI)
			{
				return null;
			}

			public override string GetNamespace(string name)
			{
				return null;
			}

			public override bool HasAttributes
			{
				get
				{
					return true;
				}
			}

			public override bool HasChildren
			{
				get
				{
					return true;
				}
			}

			public override bool IsEmptyElement
			{
				get
				{
					return true;
				}
			}

			public override bool IsSamePosition(System.Xml.XPath.XPathNavigator other)
			{
				return true;
			}

			public override string LocalName
			{
				get
				{
					return null;
				}
			}

			public override bool MoveTo(System.Xml.XPath.XPathNavigator other)
			{
				return true;
			}

			public override bool MoveToAttribute(string localName, string namespaceURI)
			{
				return true;
			}

			public override bool MoveToFirst()
			{
				return true;
			}

			public override bool MoveToFirstAttribute()
			{
				return true;
			}

			public override bool MoveToFirstChild()
			{
				return true;
			}

			public override bool MoveToFirstNamespace(System.Xml.XPath.XPathNamespaceScope namespaceScope)
			{
				return true;
			}

			public override bool MoveToId(string id)
			{
				return true;
			}

			public override bool MoveToNamespace(string name)
			{
				return true;
			}

			public override bool MoveToNext()
			{
				return true;
			}

			public override bool MoveToNextAttribute()
			{
				return true;
			}

			public override bool MoveToNextNamespace(System.Xml.XPath.XPathNamespaceScope namespaceScope)
			{
				return true;
			}

			public override bool MoveToParent()
			{
				return true;
			}

			public override void MoveToRoot()
			{
			
			}

			public override string Name
			{
				get
				{
					return null;
				}
			}

			public override string NamespaceURI
			{
				get
				{
					return null;
				}
			}

			public override System.Xml.XmlNameTable NameTable
			{
				get
				{
					return null;
				}
			}

			public override System.Xml.XPath.XPathNodeType NodeType
			{
				get
				{
					return new System.Xml.XPath.XPathNodeType();
				}
			}

			public override string Prefix
			{
				get
				{
					return null;
				}
			}

			public override string Value
			{
				get
				{
					return null;
				}
			}

			public override string XmlLang
			{
				get
				{
					return null;
				}
			}

			public override bool MoveToPrevious()
			{
				return true;
			}
		}

		private MockXPathDocument mockXD = null;

		[SetUp]
		public void init() 
		{
			mockXD = new MockXPathDocument();
		}
		[TearDown]
		public void Destroy() 
		{
			mockXD = null;
		}
		[Test]
		public void CreateNavigatorExpectedCount()
		{
			mockXD.SetExpectedCreateCalls(2);
			mockXD.CreateNavigator();
			mockXD.CreateNavigator();
			mockXD.Verify();
		}
		[Test]
		[ExpectedException(typeof(AssertionException))]
		public void CreateNavigatorExpectedCountFails() 
		{
			mockXD.SetExpectedCreateCalls(2);
			mockXD.CreateNavigator();
			mockXD.Verify();
		}
		[Test]
		[ExpectedException(typeof(XmlException))]
		public void ExceptionCreateNavigator() 
		{
			mockXD.SetExpectedCreateException(new XmlException("", null));
			mockXD.CreateNavigator();
		}
		[Test]
		public void ExpectedNavigator() 
		{
			XPathNavigator expectedNav = new TestXPathNavigator();
			mockXD.SetExpectedNavigator( expectedNav );
 			Assertion.AssertEquals("Navigators not equal.", expectedNav, mockXD.CreateNavigator());
		}
		[Test]
		public void DummyNavigator() 
		{
			XPathNavigator navigator = null;
			navigator = mockXD.CreateNavigator();
			Assertion.AssertNotNull( "Navigator should never be null.", navigator );
			Assertion.AssertEquals( "Navigators should equal.", typeof(XPathNavigator), navigator.GetType().BaseType );

		}
	}
}

--- NEW FILE: MockXPathNavigatorTests.cs ---
using System;
using NUnit.Framework;
using DotNetMock.Framework.Xml.XPath;
namespace DotNetMock.Framework.Tests.Xml.XPath
{
	[TestFixture]
	public class MockXPathNavigatorTests
	{
		private MockXPathNavigator mockNav = null;

		[SetUp]
		public void Init()
		{
			mockNav = new MockXPathNavigator();
		}
		[TearDown]
		public void Destroy()
		{
			mockNav = null;
		}
		[Test]
		public void SelectCalls()
		{
			mockNav.SetExpectedSelectCalls( 4 );
			mockNav.Select("");
			mockNav.Select("");
			mockNav.Select("");
			mockNav.Select("");
			mockNav.Verify();
		}
		[Test]
		[ExpectedException(typeof(AssertionException))]
		public void InvalidSelectCalls()
		{
			mockNav.SetExpectedSelectCalls( 5 );
			mockNav.Select("");
			mockNav.Select("");
			mockNav.Verify();
		}
		[Test]
		public void IteratorNeverNull()
		{
			Assertion.AssertNotNull("Iterator is null!", mockNav.Select(""));
		}
		[Test]
		public void IteratorsEqual()
		{
			MockXPathNodeIterator it = new MockXPathNodeIterator();
			mockNav.SetExpectedIterator( it );
			Assertion.AssertEquals("Iterators do not equal.", it, mockNav.Select(""));
		}
		[Test]
		[ExpectedException(typeof(ArgumentException))]
		public void ThrowsSelectException()
		{
			mockNav.SetExpectedException( new ArgumentException() );
			mockNav.Select("");
		}
	}
}

--- NEW FILE: MockXPathNodeIteratorTests.cs ---
using System;
using System.Collections;
using DotNetMock.Framework.Xml.XPath;
using System.Xml.XPath;
using NUnit.Framework;

namespace DotNetMock.Framework.Tests.Xml.XPath
{
	[TestFixture]
	public class MockXPathNodeIteratorTests 
	{
		private MockXPathNodeIterator _iterator = null;

		[SetUp]
		public void Init() 
		{
			_iterator = new MockXPathNodeIterator();
		}
		[TearDown]
		public void Destroy()
		{
			_iterator = null;
		}
		[Test]
		public void MoveNextCount()
		{
			_iterator.SetExpectedMoveNextCalls( 3 );
			_iterator.MoveNext();
			_iterator.MoveNext();
			_iterator.MoveNext();
			_iterator.Verify();
		}
		[Test]
		[ExpectedException(typeof(AssertionException))]
		public void InvalidMoveNextCount()
		{
			_iterator.SetExpectedMoveNextCalls( 3 );
			_iterator.MoveNext();
			_iterator.MoveNext();
			_iterator.Verify();
		}
		[Test]
		public void ValidCount()
		{
			Assertion.AssertEquals("Counts don't equal.", 0, _iterator.Count);
			SetValidAssumptions();
			Assertion.AssertEquals("Counts don't equal.", 3, _iterator.Count);
		}
		[Test]
		public void ValidCurrent()
		{
			SetValidAssumptions();
			Assertion.Assert(_iterator.MoveNext());
			Assertion.AssertNotNull("Current is null.", _iterator.Current);
			Assertion.Assert(_iterator.MoveNext());
			Assertion.AssertNotNull("Current is null.", _iterator.Current);
			Assertion.Assert(_iterator.MoveNext());
			Assertion.AssertNotNull("Current is null.", _iterator.Current);
			Assertion.Assert(!_iterator.MoveNext());
		}
		[Test]
		public void ValidCurrentPosition()
		{
			SetValidAssumptions();
			Assertion.AssertEquals("CurrentPosition doesn't equal.", 0, _iterator.CurrentPosition);
			Assertion.Assert(_iterator.MoveNext());
			Assertion.AssertEquals("CurrentPosition doesn't equal.", 1, _iterator.CurrentPosition);
			Assertion.Assert(_iterator.MoveNext());
			Assertion.AssertEquals("CurrentPosition doesn't equal.", 2, _iterator.CurrentPosition);
			Assertion.Assert(_iterator.MoveNext());
			Assertion.AssertEquals("CurrentPosition doesn't equal.", 3, _iterator.CurrentPosition);
			Assertion.Assert(!_iterator.MoveNext());
			Assertion.AssertEquals("CurrentPosition doesn't equal.", 3, _iterator.CurrentPosition);

		}
		[Test]
		public void NoDataToIterateOver()
		{
			Assertion.AssertEquals("CurrentPosition doesn't equal.", 0, _iterator.CurrentPosition);
			Assertion.Assert(!_iterator.MoveNext());
			Assertion.AssertEquals("CurrentPosition doesn't equal.", 0, _iterator.CurrentPosition);
		}
		private void SetValidAssumptions()
		{
			ArrayList expected = new ArrayList();
			expected.Add(new MockXPathNavigator());
			expected.Add(new MockXPathNavigator());
			expected.Add(new MockXPathNavigator());
			_iterator.SetExpectedData( expected );
		}
	}
}

[Dotnetmock-developer] dotnetmock/lib nunit.framework.dll,NONE,1.1

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv23859/lib

Added Files:
	nunit.framework.dll 
Log Message:
Added Mock Objects for System.Xml.XPath namespace: XPathDocument, XPathNavigator, XPathNodeIterator
Added MockObject & NUnitTest wizards
Added nunit.framework.dll to distribution
Fixed Master build install of VisualStudioTemplates
Added various comments and XML documentation to various classes


--- NEW FILE: nunit.framework.dll ---
(This appears to be a binary file; contents omitted.)

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework AssemblyInfo.cs,NONE,1.1 DotNetMock.Framework.csproj,1.5,1.6

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework
In directory sc8-pr-cvs1:/tmp/cvs-serv23859/DotNetMock.Framework

Modified Files:
	DotNetMock.Framework.csproj 
Added Files:
	AssemblyInfo.cs 
Log Message:
Added Mock Objects for System.Xml.XPath namespace: XPathDocument, XPathNavigator, XPathNodeIterator
Added MockObject & NUnitTest wizards
Added nunit.framework.dll to distribution
Fixed Master build install of VisualStudioTemplates
Added various comments and XML documentation to various classes


--- NEW FILE: AssemblyInfo.cs ---
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// Marks CLS Compliance
[assembly:CLSCompliant(true)]

// Marks COM Visibility to false. we don't want COM clients to use this assembly
[assembly:ComVisible(false)]
//
// General Information about an assembly is controlled through the following 
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
[assembly: AssemblyTitle("DotNetMock")]
[assembly: AssemblyDescription(".NET Implementation of Mock Objects")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]		

//
// Version information for an assembly consists of the following four values:
//
//      Major Version
//      Minor Version 
//      Build Number
//      Revision
//
// You can specify all the values or you can default the Revision and Build Numbers 
// by using the '*' as shown below:

[assembly: AssemblyVersion("0.4.0.*")]

//
// In order to sign your assembly you must specify a key to use. Refer to the 
// Microsoft .NET Framework documentation for more information on assembly signing.
//
// Use the attributes below to control which key is used for signing. 
//
// Notes: 
//   (*) If no key is specified, the assembly is not signed.
//   (*) KeyName refers to a key that has been installed in the Crypto Service
//       Provider (CSP) on your machine. KeyFile refers to a file which contains
//       a key.
//   (*) If the KeyFile and the KeyName values are both specified, the 
//       following processing occurs:
//       (1) If the KeyName can be found in the CSP, that key is used.
//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
//           in the KeyFile is installed into the CSP and used.
//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
//       When specifying the KeyFile, the location of the KeyFile should be
//       relative to the project output directory which is
//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
//       located in the project directory, you would specify the AssemblyKeyFile 
//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
//       documentation for more information on this.
//
[assembly: AssemblyDelaySign(false)]
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]

Index: DotNetMock.Framework.csproj
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/DotNetMock.Framework.csproj,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DotNetMock.Framework.csproj	1 Apr 2003 01:43:57 -0000	1.5
--- DotNetMock.Framework.csproj	7 Apr 2003 00:43:57 -0000	1.6
***************
*** 138,142 ****
                  />
                  <File
!                     RelPath = "Xml\XPath\MockXPathNavigable.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
--- 138,152 ----
                  />
                  <File
!                     RelPath = "Xml\XPath\MockXPathDocument.cs"
!                     SubType = "Code"
!                     BuildAction = "Compile"
!                 />
!                 <File
!                     RelPath = "Xml\XPath\MockXPathNavigator.cs"
!                     SubType = "Code"
!                     BuildAction = "Compile"
!                 />
!                 <File
!                     RelPath = "Xml\XPath\MockXPathNodeIterator.cs"
                      SubType = "Code"
                      BuildAction = "Compile"

[Dotnetmock-developer] dotnetmock/DotNetMock.Framework.Tests DotNetMock.Framework.Tests.csproj,1.1,1.2

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests
In directory sc8-pr-cvs1:/tmp/cvs-serv23859/DotNetMock.Framework.Tests

Modified Files:
	DotNetMock.Framework.Tests.csproj 
Log Message:
Added Mock Objects for System.Xml.XPath namespace: XPathDocument, XPathNavigator, XPathNodeIterator
Added MockObject & NUnitTest wizards
Added nunit.framework.dll to distribution
Fixed Master build install of VisualStudioTemplates
Added various comments and XML documentation to various classes


Index: DotNetMock.Framework.Tests.csproj
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework.Tests/DotNetMock.Framework.Tests.csproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DotNetMock.Framework.Tests.csproj	11 Mar 2003 20:34:03 -0000	1.1
--- DotNetMock.Framework.Tests.csproj	7 Apr 2003 00:43:57 -0000	1.2
***************
*** 70,74 ****
                  <Reference
                      Name = "System.XML"
!                     AssemblyName = "System.XML"
                      HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
                  />
--- 70,74 ----
                  <Reference
                      Name = "System.XML"
!                     AssemblyName = "System.Xml"
                      HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
                  />
***************
*** 128,132 ****
                  />
                  <File
!                     RelPath = "Xml\XPath\MockXPathNavigableTests.cs"
                      SubType = "Code"
                      BuildAction = "Compile"
--- 128,142 ----
                  />
                  <File
!                     RelPath = "Xml\XPath\MockXPathDocumentTests.cs"
!                     SubType = "Code"
!                     BuildAction = "Compile"
!                 />
!                 <File
!                     RelPath = "Xml\XPath\MockXPathNavigatorTests.cs"
!                     SubType = "Code"
!                     BuildAction = "Compile"
!                 />
!                 <File
!                     RelPath = "Xml\XPath\MockXPathNodeIteratorTests.cs"
                      SubType = "Code"
                      BuildAction = "Compile"

[Dotnetmock-developer] dotnetmock/VisualStudioTemplates/CSharpProjectItems/LocalProjectItems/Code MockObject.vsdir,NONE,1.1 NUnitTest.vsdir,NONE,1.1

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/VisualStudioTemplates/CSharpProjectItems/LocalProjectItems/Code
In directory sc8-pr-cvs1:/tmp/cvs-serv23859/VisualStudioTemplates/CSharpProjectItems/LocalProjectItems/Code

Added Files:
	MockObject.vsdir NUnitTest.vsdir 
Log Message:
Added Mock Objects for System.Xml.XPath namespace: XPathDocument, XPathNavigator, XPathNodeIterator
Added MockObject & NUnitTest wizards
Added nunit.framework.dll to distribution
Fixed Master build install of VisualStudioTemplates
Added various comments and XML documentation to various classes


--- NEW FILE: MockObject.vsdir ---
..\..\CSharpAddMockObject.vsz|{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}|Mock Object|0|Mock Object Template|{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}|4534|0|MockObject.cs
--- NEW FILE: NUnitTest.vsdir ---
..\..\CSharpAddNUnitTest.vsz|{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}|NUnit Test|0|NUnit Test Template|{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}|4534|0|NUnitTest.cs

[Dotnetmock-developer] dotnetmock/DotNetMock IMockObject.cs,NONE,1.1 MockObject.cs,1.11,1.12

[<gc...@us...>]

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock
In directory sc8-pr-cvs1:/tmp/cvs-serv23859/DotNetMock

Modified Files:
	MockObject.cs 
Added Files:
	IMockObject.cs 
Log Message:
Added Mock Objects for System.Xml.XPath namespace: XPathDocument, XPathNavigator, XPathNodeIterator
Added MockObject & NUnitTest wizards
Added nunit.framework.dll to distribution
Fixed Master build install of VisualStudioTemplates
Added various comments and XML documentation to various classes


--- NEW FILE: IMockObject.cs ---
/*
 * ============================================================================
 *                   The Apache Software License, Version 1.1
 * ============================================================================
 * 
 *    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
 * 
 * Redistribution and use in source and binary forms, with or without modifica-
 * tion, are permitted provided that the following conditions are met:
 * 
 * 1. Redistributions of  source code must  retain the above copyright  notice,
 *    this list of conditions and the following disclaimer.
 * 
 * 2. Redistributions in binary form must reproduce the above copyright notice,
 *    this list of conditions and the following disclaimer in the documentation
 *    and/or other materials provided with the distribution.
 * 
 * 3. The end-user documentation included with the redistribution, if any, must
 *    include  the following  acknowledgment:  "This product includes  software
 *    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
 *    Alternately, this  acknowledgment may  appear in the software itself,  if
 *    and wherever such third-party acknowledgments normally appear.
 * 
 * 4. The names "log4j" and  "Apache Software Foundation"  must not be used to
 *    endorse  or promote  products derived  from this  software without  prior
 *    written permission. For written permission, please contact
 *    ap...@ap....
 * 
 * 5. Products  derived from this software may not  be called "Apache", nor may
 *    "Apache" appear  in their name,  without prior written permission  of the
 *    Apache Software Foundation.
 * 
 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
 * FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
 * APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
 * INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
 * DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
 * OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
 * ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
 * (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 * This software  consists of voluntary contributions made  by many individuals
 * on  behalf of the Apache Software  Foundation.  For more  information on the 
 * Apache Software Foundation, please see <http://www.apache.org/>.
 *
 */

using System;

namespace DotNetMock
{
	public interface IMockObject : IVerifiable
	{
		void NotImplemented( string methodName );
		string MockName {get; set;}
	}
}

Index: MockObject.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/MockObject.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MockObject.cs	1 Apr 2003 01:43:56 -0000	1.11
--- MockObject.cs	7 Apr 2003 00:43:56 -0000	1.12
***************
*** 93,100 ****
  		/// Throws NotImplementedException.
  		/// </summary>
! 		/// <param name="className">Class Name.</param>
! 		public void NotImplemented(string className) 
  		{
! 			throw new NotImplementedException(className + " not currently implemented");
  		}
  		/// <summary>
--- 93,100 ----
  		/// Throws NotImplementedException.
  		/// </summary>
! 		/// <param name="className">Method that isn't implemented.</param>
! 		public void NotImplemented(string methodName) 
  		{
! 			throw new NotImplementedException(methodName + " not currently implemented");
  		}
  		/// <summary>