[Dotnetmock-commits] dotnetmock/DotNetMock AbstractExpectation.cs,1.15,1.16 IExpectation.cs,1.5,1.6 MockObject.cs,1.19,1.20

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

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

Modified Files:
	AbstractExpectation.cs IExpectation.cs MockObject.cs 
Log Message:
- Various FxCop fixes

Index: MockObject.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/MockObject.cs,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** MockObject.cs	2 Aug 2004 21:22:37 -0000	1.19
--- MockObject.cs	5 Feb 2005 22:05:10 -0000	1.20
***************
*** 12,21 ****
  		/// Field to hold the name of this MockObject
  		/// </summary>
! 		protected string name = null;
  		
  		/// <summary>
  		/// Flag to indicate if this object has been verified
  		/// </summary>
! 		protected bool verified = false;
  
  		/// <summary>
--- 12,21 ----
  		/// Field to hold the name of this MockObject
  		/// </summary>
! 		private string _name = null;
  		
  		/// <summary>
  		/// Flag to indicate if this object has been verified
  		/// </summary>
! 		private bool _verified = false;
  
  		/// <summary>
***************
*** 31,35 ****
  		public MockObject() 
  		{
! 			name = "MockObject";
  		}
  		/// <summary>
--- 31,35 ----
  		public MockObject() 
  		{
! 			_name = "MockObject";
  		}
  		/// <summary>
***************
*** 38,42 ****
  		public bool IsVerified 
  		{
! 			get { return verified; }
  		}
  
--- 38,42 ----
  		public bool IsVerified 
  		{
! 			get { return _verified; }
  		}
  
***************
*** 55,59 ****
  		{
  			Verifier.Verify(this);
! 			verified = true;
  		}
  		/// <summary>
--- 55,59 ----
  		{
  			Verifier.Verify(this);
! 			_verified = true;
  		}
  		/// <summary>
***************
*** 64,72 ****
  			get 
  			{
! 				return name;
  			}
  			set	
  			{
! 				name = value;
  			}
  		}
--- 64,72 ----
  			get 
  			{
! 				return _name;
  			}
  			set	
  			{
! 				_name = value;
  			}
  		}

Index: IExpectation.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/IExpectation.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IExpectation.cs	10 Oct 2004 07:53:31 -0000	1.5
--- IExpectation.cs	5 Feb 2005 22:05:10 -0000	1.6
***************
*** 16,20 ****
  		/// Sets the verify immediate flag
  		/// </summary>
! 		bool VerifyImmediate {set;}
  		/// <summary>
  		/// Gets should check immediate
--- 16,20 ----
  		/// Sets the verify immediate flag
  		/// </summary>
! 		bool VerifyImmediate {get;set;}
  		/// <summary>
  		/// Gets should check immediate

Index: AbstractExpectation.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock/AbstractExpectation.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** AbstractExpectation.cs	10 Oct 2004 07:53:31 -0000	1.15
--- AbstractExpectation.cs	5 Feb 2005 22:05:10 -0000	1.16
***************
*** 22,26 ****
  		/// Flag to indicate if this object has been verified
  		/// </summary>
! 		protected bool verified = false;
  		/// <summary>
  		/// Verifys current object and all MockObject fields within.
--- 22,26 ----
  		/// Flag to indicate if this object has been verified
  		/// </summary>
! 		private bool _verified = false;
  		/// <summary>
  		/// Verifys current object and all MockObject fields within.
***************
*** 47,50 ****
--- 47,54 ----
  		public bool VerifyImmediate
  		{
+ 			get
+ 			{
+ 				return this._verifyImmediate;
+ 			}
  			set 
  			{
***************
*** 76,80 ****
  		public bool IsVerified 
  		{
! 			get { return verified; }
  		}
  	}
--- 80,84 ----
  		public bool IsVerified 
  		{
! 			get { return _verified; }
  		}
  	}