[Dotnetmock-commits] dotnetmock/DotNetMock.Tests/Dynamic/Generate ClassGeneratorTests.cs,1.15,1.16

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

Update of /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/Generate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6085/DotNetMock.Tests/Dynamic/Generate

Modified Files:
	ClassGeneratorTests.cs 
Log Message:
- Upgraded Tests to use NUnit 2.2

Index: ClassGeneratorTests.cs
===================================================================
RCS file: /cvsroot/dotnetmock/dotnetmock/DotNetMock.Tests/Dynamic/Generate/ClassGeneratorTests.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ClassGeneratorTests.cs	5 Jan 2005 14:10:33 -0000	1.15
--- ClassGeneratorTests.cs	12 Feb 2005 18:10:36 -0000	1.16
***************
*** 200,204 ****
  			mock.ExpectAndReturn("simpleReturn", x);
  			object result = thingy.simpleReturn();
! 			Assertion.AssertEquals(x, result);
  			mock.Verify();
  		}
--- 200,204 ----
  			mock.ExpectAndReturn("simpleReturn", x);
  			object result = thingy.simpleReturn();
! 			Assert.AreEqual(x, result);
  			mock.Verify();
  		}
***************
*** 210,214 ****
  			mock.ExpectAndReturn("stringReturn", x);
  			string result = thingy.stringReturn();
! 			Assertion.AssertEquals(x, result);
  			mock.Verify();
  		}
--- 210,214 ----
  			mock.ExpectAndReturn("stringReturn", x);
  			string result = thingy.stringReturn();
! 			Assert.AreEqual(x, result);
  			mock.Verify();
  		}
***************
*** 220,224 ****
  			mock.ExpectAndReturn("AThingy", t);
  			IThingy result = thingy.AThingy();
! 			Assertion.AssertEquals(thingy, result);
  			mock.Verify();
  		}
--- 220,224 ----
  			mock.ExpectAndReturn("AThingy", t);
  			IThingy result = thingy.AThingy();
! 			Assert.AreEqual(thingy, result);
  			mock.Verify();
  		}
***************
*** 229,233 ****
  			mock.ExpectAndReturn("intReturn", 7);
  			int result = thingy.intReturn();
! 			Assertion.AssertEquals(7, result);
  			mock.Verify();
  		}
--- 229,233 ----
  			mock.ExpectAndReturn("intReturn", 7);
  			int result = thingy.intReturn();
! 			Assert.AreEqual(7, result);
  			mock.Verify();
  		}
***************
*** 238,243 ****
  			mock.ExpectAndReturn("boolReturn", true);
  			mock.ExpectAndReturn("doubleReturn", 1234567891234E+10);
! 			Assertion.Assert(thingy.boolReturn());
! 			Assertion.AssertEquals(1234567891234E+10, thingy.doubleReturn());
  			mock.Verify();
  		}
--- 238,243 ----
  			mock.ExpectAndReturn("boolReturn", true);
  			mock.ExpectAndReturn("doubleReturn", 1234567891234E+10);
! 			Assert.IsTrue(thingy.boolReturn());
! 			Assert.AreEqual(1234567891234E+10, thingy.doubleReturn());
  			mock.Verify();
  		}
***************
*** 315,320 ****
  			mock.ExpectAndReturn("ReadProperty", "hello");
  			mock.ExpectAndReturn("ReadProperty", "world");
! 			Assertion.AssertEquals("hello", thingy.ReadProperty);
! 			Assertion.AssertEquals("world", thingy.ReadProperty);
  			mock.Verify();
  		}
--- 315,320 ----
  			mock.ExpectAndReturn("ReadProperty", "hello");
  			mock.ExpectAndReturn("ReadProperty", "world");
! 			Assert.AreEqual("hello", thingy.ReadProperty);
! 			Assert.AreEqual("world", thingy.ReadProperty);
  			mock.Verify();
  		}
***************
*** 339,344 ****
  			thingy.AProperty = "hello";
  			thingy.AProperty = "world";
! 			Assertion.AssertEquals("good", thingy.AProperty);
! 			Assertion.AssertEquals("bye", thingy.AProperty);
  			mock.Verify();
  		}
--- 339,344 ----
  			thingy.AProperty = "hello";
  			thingy.AProperty = "world";
! 			Assert.AreEqual("good", thingy.AProperty);
! 			Assert.AreEqual("bye", thingy.AProperty);
  			mock.Verify();
  		}
***************
*** 354,363 ****
  			mock.ExpectAndReturn("GetHashCode", 123);
  			mock.ExpectAndReturn("AbstractMethod", "fish");
! 			Assertion.AssertEquals("hello", s.VirtualMethod());
! 			Assertion.AssertEquals("STRING", s.ToString());
! 			Assertion.AssertEquals(123, s.GetHashCode());
! 			Assertion.AssertEquals("fish", s.AbstractMethod());
  
! 			Assertion.AssertEquals("xx", s.NonVirtualMethod());
  			mock.Verify();
  		}
--- 354,363 ----
  			mock.ExpectAndReturn("GetHashCode", 123);
  			mock.ExpectAndReturn("AbstractMethod", "fish");
! 			Assert.AreEqual("hello", s.VirtualMethod());
! 			Assert.AreEqual("STRING", s.ToString());
! 			Assert.AreEqual(123, s.GetHashCode());
! 			Assert.AreEqual("fish", s.AbstractMethod());
  
! 			Assert.AreEqual("xx", s.NonVirtualMethod());
  			mock.Verify();
  		}
***************
*** 407,411 ****
        
  			mock.Verify();
! 			Assertion.AssertEquals(guid, returnedGuid);
  		}
  	}
--- 407,411 ----
        
  			mock.Verify();
! 			Assert.AreEqual(guid, returnedGuid);
  		}
  	}