[Dotnetmock-developer] dotnetmock/DotNetMock.Examples/CustomExpectation ExpectationPerson.cs,1.1,1.2 ExpectationPersonTests.cs,1.1,1.2

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

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Examples/CustomExpectation
In directory sc8-pr-cvs1:/tmp/cvs-serv21618/DotNetMock.Examples/CustomExpectation

Modified Files:
	ExpectationPerson.cs ExpectationPersonTests.cs 
Log Message:


Index: ExpectationPerson.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Examples/CustomExpectation/ExpectationPerson.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExpectationPerson.cs	31 Dec 2003 19:28:58 -0000	1.1
--- ExpectationPerson.cs	2 Jan 2004 00:55:24 -0000	1.2
***************
*** 17,21 ****
  		{
  			get { return _expectedPerson; }
! 			set { _expectedPerson = value; }
  		}
  		public Person Actual
--- 17,24 ----
  		{
  			get { return _expectedPerson; }
! 			set { 
! 				_expectedPerson = value;
! 				HasExpectations = true;
! 			}
  		}
  		public Person Actual
***************
*** 35,39 ****
  		public override void Verify()
  		{
! 			Assertion.AssertEquals( "People do not match. Expected name: " + _expectedPerson.Name + " , Actual name: " + _actualPerson.Name , _expectedPerson, _actualPerson );
  		}
  	}
--- 38,43 ----
  		public override void Verify()
  		{
! 			Assertion.AssertEquals( "People do not match. Expected Name: " + _expectedPerson.Name + " , Actual Name: " + _actualPerson.Name , _expectedPerson.Name, _actualPerson.Name );
! 			Assertion.AssertEquals( "People do not match. Expected Age: " + _expectedPerson.Age + " , Actual Age: " + _actualPerson.Age , _expectedPerson.Age, _actualPerson.Age );
  		}
  	}

Index: ExpectationPersonTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Examples/CustomExpectation/ExpectationPersonTests.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExpectationPersonTests.cs	31 Dec 2003 19:28:58 -0000	1.1
--- ExpectationPersonTests.cs	2 Jan 2004 00:55:24 -0000	1.2
***************
*** 8,11 ****
--- 8,13 ----
  	{
  		private ExpectationPerson _expectationPerson = null;
+ 		private Person _actualPerson = null;
+ 		private Person _expectedPerson = null;
  
  		[SetUp]
***************
*** 13,16 ****
--- 15,20 ----
  		{
  			_expectationPerson = new ExpectationPerson( "ExpectationPersonTests.ExpectationPerson" );
+ 			_actualPerson = new Person( "Bobby Fake", 35 );
+ 			_expectedPerson = new Person( "Bobby Fake", 35 );		
  		}
  		[TearDown]
***************
*** 18,31 ****
  		{
  			_expectationPerson = null;
  		}
  		[Test]
! 		public void ExpectedPerson()
  		{
! 			Person expectedPerson = new Person( "Bobby Fake", 35 );
! 			Person actualPerson = new Person( "Bobby Fake", 35 );
! 			_expectationPerson.Expected = expectedPerson;
  			Assertion.Assert( _expectationPerson.HasExpectations );
! 			_expectationPerson.Actual = actualPerson;
  			_expectationPerson.Verify();
  		}
  	}
--- 22,74 ----
  		{
  			_expectationPerson = null;
+ 			_actualPerson = null;
+ 			_expectedPerson = null;
  		}
  		[Test]
! 		public void ExpectedPersonEqual()
  		{
! 			_expectationPerson.Expected = _expectedPerson;
  			Assertion.Assert( _expectationPerson.HasExpectations );
! 			_expectationPerson.Actual = _actualPerson;
  			_expectationPerson.Verify();
+ 		}
+ 		[Test]
+ 		public void ExpectedPersonFailure()
+ 		{
+ 			Person thirdWheel = new Person( "Bob De Niro", 56 );
+ 			_expectationPerson.Actual = _actualPerson;
+ 			_expectationPerson.Expected = thirdWheel;
+ 
+ 			try 
+ 			{
+ 				_expectationPerson.Verify();
+ 				Assertion.Fail( "Should throw exception" );
+ 			}
+ 			catch
+ 			{
+ 
+ 			}
+ 			_expectationPerson.Expected = _expectedPerson;
+ 			_expectationPerson.Verify();
+ 		}
+ 		[Test]
+ 		public void ExpectationPersonActual()
+ 		{
+ 			Assertion.AssertNull( "Actual person", _expectationPerson.Actual );
+ 			_expectationPerson.Actual = _actualPerson;
+ 			Assertion.AssertNotNull( "Actual Person not null", _expectationPerson.Actual );
+ 			Assertion.AssertEquals( "People not equal", _actualPerson, _expectationPerson.Actual );
+ 			_expectationPerson.ClearActual();
+ 			Assertion.AssertNull( "Actual person null", _expectationPerson.Actual );
+ 		}
+ 		[Test]
+ 		public void ExpectationPersonExpected()
+ 		{
+ 			Assertion.AssertNull( "Expected person", _expectationPerson.Expected );
+ 			_expectationPerson.Expected = _expectedPerson;
+ 			Assertion.AssertNotNull( "Expected Person not null", _expectationPerson.Expected );
+ 			Assertion.AssertEquals( "People not equal", _expectedPerson, _expectationPerson.Expected );
+ 			_expectationPerson.ClearExpected();
+ 			Assertion.AssertNull( "Expected person null", _expectationPerson.Expected );
  		}
  	}