[Dotnetmock-developer] dotnetmock/DotNetMock.Tests ExpectationArrayListTests.cs,1.2,1.3 ExpectationStringTests.cs,1.2,1.3 ExpectationTypeTests.cs,1.2,1.3 ExpectationValueTests.cs,1.2,1.3 ExpectationListTest.cs,1.1,NONE

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

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

Modified Files:
	ExpectationArrayListTests.cs ExpectationStringTests.cs 
	ExpectationTypeTests.cs ExpectationValueTests.cs 
Removed Files:
	ExpectationListTest.cs 
Log Message:



Index: ExpectationArrayListTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ExpectationArrayListTests.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExpectationArrayListTests.cs	25 Oct 2002 03:02:26 -0000	1.2
--- ExpectationArrayListTests.cs	25 Oct 2002 03:56:52 -0000	1.3
***************
*** 113,144 ****
  		
  		[Test]
  		public void FailImmediately()
  		{
  			_expectationArrayList.AddExpected("A");
  			_expectationArrayList.AddExpected("B");
  
  			_expectationArrayList.AddActual("A");
! 			try 
! 			{
! 				_expectationArrayList.AddActual("C");
! 				NUnit.Framework.Assertion.Fail("Should have thrown an exception.");
! 			}
! 			catch (NUnit.Framework.AssertionException ex)
! 			{
! 			}
  		}
  		[Test]
  		public void FailImmediatelyTooMany()
  		{
  			_expectationArrayList.AddExpected("A");
  			_expectationArrayList.AddActual("A");
! 			try 
! 			{
! 				_expectationArrayList.AddActual("C");
! 				NUnit.Framework.Assertion.Fail("Should have thrown an exception.");
! 			}
! 			catch (NUnit.Framework.AssertionException ex)
! 			{
! 			}
  		}
  
--- 113,134 ----
  		
  		[Test]
+ 		[ExpectedException(typeof(AssertionException))]
  		public void FailImmediately()
  		{
  			_expectationArrayList.AddExpected("A");
  			_expectationArrayList.AddExpected("B");
+ 			_expectationArrayList.VerifyImmediate = true;
  
  			_expectationArrayList.AddActual("A");
! 			_expectationArrayList.AddActual("C");
  		}
  		[Test]
+ 		[ExpectedException(typeof(AssertionException))]
  		public void FailImmediatelyTooMany()
  		{
  			_expectationArrayList.AddExpected("A");
  			_expectationArrayList.AddActual("A");
! 			_expectationArrayList.VerifyImmediate = true;
! 			_expectationArrayList.AddActual("C");
  		}
  

Index: ExpectationStringTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ExpectationStringTests.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExpectationStringTests.cs	25 Oct 2002 03:02:26 -0000	1.2
--- ExpectationStringTests.cs	25 Oct 2002 03:56:52 -0000	1.3
***************
*** 65,68 ****
--- 65,69 ----
  
  		[Test]
+ 		[ExpectedException(typeof(AssertionException))]
  		public void Verify()
  		{
***************
*** 74,86 ****
  			_expectationString.Expected = test5;
  
! 			try 
! 			{
! 				_expectationString.Verify();
! 				NUnit.Framework.Assertion.Fail("Should have thrown an exception.");
! 			}
! 			catch (NUnit.Framework.AssertionException ex) 
! 			{
! 			}
! 
  			_expectationString.Expected = test6;
  			_expectationString.Verify();
--- 75,80 ----
  			_expectationString.Expected = test5;
  
! 			_expectationString.Verify();
! 				
  			_expectationString.Expected = test6;
  			_expectationString.Verify();

Index: ExpectationTypeTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ExpectationTypeTests.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExpectationTypeTests.cs	25 Oct 2002 03:02:26 -0000	1.2
--- ExpectationTypeTests.cs	25 Oct 2002 03:56:52 -0000	1.3
***************
*** 61,64 ****
--- 61,65 ----
  
  		[Test]
+ 		[ExpectedException(typeof(AssertionException))]
  		public void Verify()
  		{
***************
*** 69,80 ****
  			_expectationType.Actual = type1 ;
  			_expectationType.Expected = type2 ;
! 			try 
! 			{
! 				_expectationType.Verify();
! 				NUnit.Framework.Assertion.Fail("Should have thrown an exception.");
! 			}
! 			catch (NUnit.Framework.AssertionException ex) 
! 			{
! 			}
  			_expectationType.Expected = type3 ;
  			_expectationType.Verify();
--- 70,76 ----
  			_expectationType.Actual = type1 ;
  			_expectationType.Expected = type2 ;
! 
! 			_expectationType.Verify();
! 			
  			_expectationType.Expected = type3 ;
  			_expectationType.Verify();

Index: ExpectationValueTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/ExpectationValueTests.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExpectationValueTests.cs	25 Oct 2002 03:02:26 -0000	1.2
--- ExpectationValueTests.cs	25 Oct 2002 03:56:52 -0000	1.3
***************
*** 58,61 ****
--- 58,62 ----
  
  		[Test]
+ 		[ExpectedException(typeof(AssertionException))]
  		public void Verify()
  		{
***************
*** 66,77 ****
  			_expectationValue.Actual = int1 ;
  			_expectationValue.Expected = int2 ;
! 			try 
! 			{
! 				_expectationValue.Verify();
! 				NUnit.Framework.Assertion.Fail("Should have thrown an exception.");
! 			}
! 			catch (NUnit.Framework.AssertionException ex) 
! 			{
! 			}
  			_expectationValue.Expected = int3 ;
  			_expectationValue.Verify();
--- 67,72 ----
  			_expectationValue.Actual = int1 ;
  			_expectationValue.Expected = int2 ;
! 			_expectationValue.Verify();
! 				
  			_expectationValue.Expected = int3 ;
  			_expectationValue.Verify();

--- ExpectationListTest.cs DELETED ---