From: <gc...@us...> - 2003-05-05 01:42:08
|
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 ---- |