[svg#-cvs] SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Events EventTests.cs,1.4,1.5

[Jeff R. <jef...@us...>]

Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Events
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1906/src/SharpVectorUnitTests/SharpVectors/Dom/Events

Modified Files:
	EventTests.cs 
Log Message:
Project wide fixes to eliminate obsolete NUnit calls, minor test related fixes

Index: EventTests.cs
===================================================================
RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Events/EventTests.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- EventTests.cs	14 Aug 2003 13:40:51 -0000	1.4
+++ EventTests.cs	20 Nov 2005 20:42:23 -0000	1.5
@@ -30,21 +30,22 @@
 		[Test]
 		public void EventTarget()
 		{
-			Assertion.Assert(rect is IEventTarget);
+      IEventTarget targ = rect as IEventTarget;
+			Assert.IsNotNull(targ);
 		}
 
 		[Test]
 		public void TestConstructor()
 		{
 			Event e = new Event("mousemove", true, false);
-			Assertion.AssertEquals("mousemove", e.Type);
-			Assertion.AssertEquals(true, e.Bubbles);
-			Assertion.AssertEquals(false, e.Cancelable);
+			Assert.AreEqual("mousemove", e.Type);
+			Assert.AreEqual(true, e.Bubbles);
+			Assert.AreEqual(false, e.Cancelable);
 
 			e = new Event("dummy", false, true);
-			Assertion.AssertEquals("dummy", e.Type);
-			Assertion.AssertEquals(false, e.Bubbles);
-			Assertion.AssertEquals(true, e.Cancelable);
+			Assert.AreEqual("dummy", e.Type);
+			Assert.AreEqual(false, e.Bubbles);
+			Assert.AreEqual(true, e.Cancelable);
 		}
 
 		[Test]
@@ -61,23 +62,23 @@
 
 		private void PropagateHandlerAtTarget(IEvent e)
 		{
-			Assertion.AssertSame(rect, e.CurrentTarget);
-			Assertion.AssertEquals(rect, e.Target);
-			Assertion.AssertEquals(EventPhase.AtTarget, e.EventPhase);
+			Assert.AreSame(rect, e.CurrentTarget);
+			Assert.AreEqual(rect, e.Target);
+			Assert.AreEqual(EventPhase.AtTarget, e.EventPhase);
 			eventStatus = 1;
 		}
 
 		private void PropagateHandlerAtG(IEvent e)
 		{
-			Assertion.AssertSame(g, e.CurrentTarget);
-			Assertion.AssertEquals(rect, e.Target);
+			Assert.AreSame(g, e.CurrentTarget);
+			Assert.AreEqual(rect, e.Target);
 			if(e.EventPhase == EventPhase.CapturingPhase || 
 				(e.EventPhase == EventPhase.BubblingPhase && eventStatus == 1))
 			{
 			}
 			else
 			{
-				Assertion.Fail();
+				Assert.Fail();
 			}
 			eventStatus = 2;
 		}
@@ -87,7 +88,7 @@
 		{
 			((IEventTarget)rect).AddEventListener("mousemove", new EventListener(PropagateHandlerAtTarget), false);
 			((IEventTarget)rect).DispatchEvent(new Event("mousemove", true, true));
-			Assertion.AssertEquals(1, eventStatus);
+			Assert.AreEqual(1, eventStatus);
 			((IEventTarget)rect).RemoveEventListener("mousemove", new EventListener(PropagateHandlerAtTarget), false);
 		}
 
@@ -97,7 +98,7 @@
 			((IEventTarget)g).AddEventListener("mousemove", new EventListener(PropagateHandlerAtG), false);
 			((IEventTarget)rect).AddEventListener("mousemove", new EventListener(PropagateHandlerAtTarget), false);
 			((IEventTarget)rect).DispatchEvent(new Event("mousemove", true, true));
-			Assertion.AssertEquals(2, eventStatus);
+			Assert.AreEqual(2, eventStatus);
 			((IEventTarget)rect).RemoveEventListener("mousemove", new EventListener(PropagateHandlerAtTarget), false);
 			((IEventTarget)g).RemoveEventListener("mousemove", new EventListener(PropagateHandlerAtG), false);
 		}
@@ -107,7 +108,7 @@
 		{
 			((IEventTarget)rect).AddEventListener("mousemove", new EventListener(PropagateHandlerAtTarget), false);
 			((IEventTarget)rect).DispatchEvent(new Event("mousemove", true, true));
-			Assertion.AssertEquals(1, eventStatus);
+			Assert.AreEqual(1, eventStatus);
 			((IEventTarget)rect).RemoveEventListener("mousemove", new EventListener(PropagateHandlerAtTarget), false);
 		}
 
@@ -116,7 +117,7 @@
 		{
 			((IEventTarget)rect).AddEventListener("mousedown", new EventListener(PropagateHandlerAtTarget), false);
 			((IEventTarget)rect).DispatchEvent(new Event("mousedown", true, true));
-			Assertion.AssertEquals(1, eventStatus);
+			Assert.AreEqual(1, eventStatus);
 			((IEventTarget)rect).AddEventListener("mousedown", new EventListener(PropagateHandlerAtTarget), false);
 		}
 
@@ -125,7 +126,7 @@
 		{
 			((IEventTarget)rect).AddEventListener("mouseup", new EventListener(PropagateHandlerAtTarget), false);
 			((IEventTarget)rect).DispatchEvent(new Event("mouseup", true, true));
-			Assertion.AssertEquals(1, eventStatus);
+			Assert.AreEqual(1, eventStatus);
 			((IEventTarget)rect).RemoveEventListener("mouseup", new EventListener(PropagateHandlerAtTarget), false);
 		}
 		
@@ -134,7 +135,7 @@
 		{
 			((IEventTarget)rect).AddEventListener("mouseover", new EventListener(PropagateHandlerAtTarget), false);
 			((IEventTarget)rect).DispatchEvent(new Event("mouseover", true, true));
-			Assertion.AssertEquals(1, eventStatus);
+			Assert.AreEqual(1, eventStatus);
 			((IEventTarget)rect).RemoveEventListener("mouseover", new EventListener(PropagateHandlerAtTarget), false);
 		}
 
@@ -143,7 +144,7 @@
 		{
 			((IEventTarget)rect).AddEventListener("mouseout", new EventListener(PropagateHandlerAtTarget), false);
 			((IEventTarget)rect).DispatchEvent(new Event("mouseout", true, true));
-			Assertion.AssertEquals(1, eventStatus);
+			Assert.AreEqual(1, eventStatus);
 			((IEventTarget)rect).RemoveEventListener("mouseout", new EventListener(PropagateHandlerAtTarget), false);
 		}
 	}