Menu
▾
▴
[Dotnetmock-developer] dotnetmock/DotNetMock.Framework/Data MockCommand.cs,1.2,1.3 MockDataParameter.cs,1.2,1.3 MockDataParameterCollection.cs,1.2,1.3
|
From: <gc...@us...> - 2003-03-26 03:14:53
|
Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data
In directory sc8-pr-cvs1:/tmp/cvs-serv24995/DotNetMock.Framework/Data
Modified Files:
MockCommand.cs MockDataParameter.cs
MockDataParameterCollection.cs
Log Message:
1) Added 'virtual' to definition of verify() in MockObject
2) Fixed MockDataParameter verification
Index: MockCommand.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockCommand.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MockCommand.cs 11 Mar 2003 22:45:36 -0000 1.2
--- MockCommand.cs 26 Mar 2003 03:14:49 -0000 1.3
***************
*** 123,127 ****
public void Prepare()
{
! throw new NotImplementedException("Canceling a command is currently not implemented.");
}
/// <summary>
--- 123,127 ----
public void Prepare()
{
! throw new NotImplementedException("Prepare() is currently not implemented.");
}
/// <summary>
Index: MockDataParameter.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDataParameter.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MockDataParameter.cs 11 Mar 2003 22:45:37 -0000 1.2
--- MockDataParameter.cs 26 Mar 2003 03:14:49 -0000 1.3
***************
*** 10,14 ****
{
private ExpectationBool _nullable = new ExpectationBool("MockDataParameter.IsNullable");
! private ExpectationString _parameterName = new ExpectationString("MockDataParameter.Name");
private ExpectationValue _parameterValue = new ExpectationValue("MockDataParameter.Value");
private ExpectationString _parameterSourceColumn = new ExpectationString("MockDataParameter.SourceColumn");
--- 10,14 ----
{
private ExpectationBool _nullable = new ExpectationBool("MockDataParameter.IsNullable");
! private ExpectationString _parameterName = new ExpectationString("MockDataParameter.ParameterName");
private ExpectationValue _parameterValue = new ExpectationValue("MockDataParameter.Value");
private ExpectationString _parameterSourceColumn = new ExpectationString("MockDataParameter.SourceColumn");
***************
*** 93,97 ****
}
-
#region Implementation of IDataParameter
--- 93,96 ----
***************
*** 117,124 ****
get
{
! return (DbType)_parameterType.Actual;
}
set
{
}
}
--- 116,131 ----
get
{
! if (_parameterType.Actual == null)
! {
! return DbType.String;
! }
! else
! {
! return (DbType)_parameterType.Actual;
! }
}
set
{
+ _parameterType.Actual = value;
}
}
***************
*** 130,133 ****
--- 137,144 ----
get
{
+ if (_parameterValue.Actual == null)
+ {
+ return "";
+ }
return _parameterValue.Actual;
}
***************
*** 135,139 ****
{
_parameterValue.Actual = value;
! _parameterType.Actual = inferType(value);
}
}
--- 146,153 ----
{
_parameterValue.Actual = value;
! if (_parameterType.Actual == null)
! {
! _parameterType.Actual = inferType(value);
! }
}
}
***************
*** 164,167 ****
--- 178,182 ----
set
{
+
}
}
***************
*** 177,180 ****
--- 192,196 ----
set
{
+ _parameterName.Actual = value;
}
}
***************
*** 186,193 ****
--- 202,218 ----
get
{
+ if ( _parameterSourceColumn.Actual == null)
+ {
+ return "";
+ }
return _parameterSourceColumn.Actual;
}
set
{
+ if (value == null)
+ {
+ _parameterSourceColumn.Actual = "";
+ }
+ _parameterSourceColumn.Actual = value;
}
}
Index: MockDataParameterCollection.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Framework/Data/MockDataParameterCollection.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MockDataParameterCollection.cs 11 Mar 2003 22:45:38 -0000 1.2
--- MockDataParameterCollection.cs 26 Mar 2003 03:14:49 -0000 1.3
***************
*** 3,6 ****
--- 3,8 ----
using System.Collections;
using System.Globalization;
+ using DotNetMock;
+ using NUnit.Framework;
namespace DotNetMock.Framework.Data
***************
*** 14,18 ****
/// Internal collection of parameters.
/// </summary>
! private ExpectationArrayList _parameterCollection = new ExpectationArrayList("MockDataParameterCollection.Tests");
/// <summary>
/// Flag indicating read-only status.
--- 16,21 ----
/// Internal collection of parameters.
/// </summary>
! private ArrayList _actualCollection = new ArrayList();
! private ArrayList _expectedCollection = new ArrayList();
/// <summary>
/// Flag indicating read-only status.
***************
*** 27,34 ****
/// Default constructor
/// </summary>
! public MockDataParameterCollection()
! {
!
! }
/// <summary>
/// Adds expected paramter to the expected collection
--- 30,35 ----
/// Default constructor
/// </summary>
! public MockDataParameterCollection() {}
!
/// <summary>
/// Adds expected paramter to the expected collection
***************
*** 37,43 ****
public void AddExpected(IDataParameter parameter)
{
! _parameterCollection.AddExpected(parameter.ParameterName);
}
#region Implementation of IDataParameterCollection
/// <summary>
/// Removes a parameter from the Actual collection
--- 38,45 ----
public void AddExpected(IDataParameter parameter)
{
! _expectedCollection.Add(parameter);
}
#region Implementation of IDataParameterCollection
+
/// <summary>
/// Removes a parameter from the Actual collection
***************
*** 46,59 ****
public void RemoveAt(string parameterName)
{
- IList actual = _parameterCollection.ActualCollection;
if (!this.Contains(parameterName) )
{
throw new ApplicationException("Parameter by that name cannot be found.");
}
! for (int i = 0; i < actual.Count; i++)
! {
! if (actual[i].Equals(parameterName))
{
! this.RemoveAt(i);
}
}
--- 48,61 ----
public void RemoveAt(string parameterName)
{
if (!this.Contains(parameterName) )
{
throw new ApplicationException("Parameter by that name cannot be found.");
}
! for (int i = 0; i < _actualCollection.Count; i++)
! {
! MockDataParameter mockDP = (MockDataParameter) _actualCollection[i];
! if (mockDP.ParameterName.Equals(parameterName))
{
! _actualCollection.RemoveAt(i);
}
}
***************
*** 67,75 ****
{
bool result = false;
- IList actual = _parameterCollection.ActualCollection;
! for (int i = 0; i < actual.Count; i++)
{
! if (actual[i].Equals(parameterName))
{
result = true;
--- 69,77 ----
{
bool result = false;
! for (int i = 0; i < _actualCollection.Count; i++)
{
! MockDataParameter mockDP = (MockDataParameter) _actualCollection[i];
! if (mockDP.ParameterName.Equals(parameterName))
{
result = true;
***************
*** 90,98 ****
}
int index = 0;
- IList actual = _parameterCollection.ActualCollection;
! for (int i = 0; i < actual.Count; i++)
{
! if (actual[i].Equals(parameterName))
{
index = i;
--- 92,100 ----
}
int index = 0;
! for (int i = 0; i < _actualCollection.Count; i++)
{
! MockDataParameter mockDP = (MockDataParameter) _actualCollection[i];
! if (mockDP.ParameterName.Equals(parameterName))
{
index = i;
***************
*** 108,118 ****
get
{
! IList actual = _parameterCollection.ActualCollection;
! return actual[IndexOf(parameterName)];
}
set
{
! IList actual = _parameterCollection.ActualCollection;
! actual[IndexOf(parameterName)] = value;
}
}
--- 110,118 ----
get
{
! return _actualCollection[IndexOf(parameterName)];
}
set
{
! _actualCollection[IndexOf(parameterName)] = value;
}
}
***************
*** 126,131 ****
public void RemoveAt(int index)
{
! IList actual = _parameterCollection.ActualCollection;
! actual.RemoveAt(index);
}
/// <summary>
--- 126,130 ----
public void RemoveAt(int index)
{
! _actualCollection.RemoveAt(index);
}
/// <summary>
***************
*** 160,165 ****
public void Clear()
{
! IList actual = _parameterCollection.ActualCollection;
! actual.Clear();
}
/// <summary>
--- 159,163 ----
public void Clear()
{
! _actualCollection.Clear();
}
/// <summary>
***************
*** 180,184 ****
public IDataParameter Add(string parameterName, string parameterValue)
{
! Add(parameterName);
return null;
}
--- 178,183 ----
public IDataParameter Add(string parameterName, string parameterValue)
{
! MockDataParameter mockDP = new MockDataParameter( parameterName, parameterValue);
! _actualCollection.Add( mockDP );
return null;
}
***************
*** 190,194 ****
public IDataParameter Add(IDataParameter value)
{
! Add(value.ParameterName);
return null;
}
--- 189,193 ----
public IDataParameter Add(IDataParameter value)
{
! _actualCollection.Add( value );
return null;
}
***************
*** 201,205 ****
public IDataParameter Add(string parameterName, DbType type)
{
! Add(parameterName);
return null;
}
--- 200,205 ----
public IDataParameter Add(string parameterName, DbType type)
{
! MockDataParameter mockDP = new MockDataParameter( parameterName, type );
! _actualCollection.Add( mockDP );
return null;
}
***************
*** 211,215 ****
public int Add(object value)
{
! _parameterCollection.AddActual(value);
return 0;
}
--- 211,215 ----
public int Add(object value)
{
! _actualCollection.Add( value );
return 0;
}
***************
*** 235,245 ****
get
{
! IList actual = _parameterCollection.ActualCollection;
! return (object)actual[index];
}
set
{
! IList actual = _parameterCollection.ActualCollection;
! actual[index] = (IDataParameter)value;
}
}
--- 235,243 ----
get
{
! return (object)_actualCollection[index];
}
set
{
! _actualCollection[index] = (IDataParameter)value;
}
}
***************
*** 277,282 ****
get
{
! IList actual = _parameterCollection.ActualCollection;
! return actual.Count;
}
}
--- 275,279 ----
get
{
! return _actualCollection.Count;
}
}
***************
*** 312,318 ****
public System.Collections.IEnumerator GetEnumerator()
{
! IList actual = _parameterCollection.ActualCollection;
! return actual.GetEnumerator();
}
#endregion
--- 309,343 ----
public System.Collections.IEnumerator GetEnumerator()
{
! return _actualCollection.GetEnumerator();
! }
! #endregion
! #region MockObject overrides
! 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();
! IDataParameter actual = (IDataParameter)_actualCollection[i];
! IDataParameter expected = (IDataParameter)_expectedCollection[i];
!
! verify.SetExpectedName( expected.ParameterName );
! verify.SetExpectedNullable( expected.IsNullable );
! verify.SetExpectedSourceColumn( expected.SourceColumn );
! verify.SetExpectedType( expected.DbType );
! verify.SetExpectedValue( expected.Value.ToString() );
! verify.ParameterName = actual.ParameterName;
! verify.IsNullable = actual.IsNullable;
! verify.SourceColumn = actual.SourceColumn;
! verify.DbType = actual.DbType;
! verify.Value = actual.Value;
!
! verify.Verify();
! }
}
#endregion
|
