Menu
▾
▴
[svg#-cvs] SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Paths SvgPathSegListTests.cs,1.5,1.6
|
From: Jeff R. <jef...@us...> - 2005-11-20 20:42:35
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Paths In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1906/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Paths Modified Files: SvgPathSegListTests.cs Log Message: Project wide fixes to eliminate obsolete NUnit calls, minor test related fixes Index: SvgPathSegListTests.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Paths/SvgPathSegListTests.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- SvgPathSegListTests.cs 23 Apr 2003 22:41:30 -0000 1.5 +++ SvgPathSegListTests.cs 20 Nov 2005 20:42:24 -0000 1.6 @@ -16,16 +16,16 @@ public void ParseTest1() { SvgPathSegList list = new SvgPathSegList("M10, 30L70-20,23 -12L23 34z", false); - Assertion.AssertEquals(5, list.NumberOfItems); - Assertion.AssertEquals("M", list[0].PathSegTypeAsLetter); - Assertion.AssertEquals(new PointF(10,30), ((SvgPathSegMovetoAbs)list[0]).AbsXY); - Assertion.AssertEquals("L", list[1].PathSegTypeAsLetter); - Assertion.AssertEquals(new PointF(70,-20), ((SvgPathSegLinetoAbs)list[1]).AbsXY); - Assertion.AssertEquals("L", list[2].PathSegTypeAsLetter); - Assertion.AssertEquals(new PointF(23,-12), ((SvgPathSegLinetoAbs)list[2]).AbsXY); - Assertion.AssertEquals("L", list[3].PathSegTypeAsLetter); - Assertion.AssertEquals(new PointF(23,34), ((SvgPathSegLinetoAbs)list[3]).AbsXY); - Assertion.AssertEquals("z", list[4].PathSegTypeAsLetter); + Assert.AreEqual(5, list.NumberOfItems); + Assert.AreEqual("M", list[0].PathSegTypeAsLetter); + Assert.AreEqual(new PointF(10,30), ((SvgPathSegMovetoAbs)list[0]).AbsXY); + Assert.AreEqual("L", list[1].PathSegTypeAsLetter); + Assert.AreEqual(new PointF(70,-20), ((SvgPathSegLinetoAbs)list[1]).AbsXY); + Assert.AreEqual("L", list[2].PathSegTypeAsLetter); + Assert.AreEqual(new PointF(23,-12), ((SvgPathSegLinetoAbs)list[2]).AbsXY); + Assert.AreEqual("L", list[3].PathSegTypeAsLetter); + Assert.AreEqual(new PointF(23,34), ((SvgPathSegLinetoAbs)list[3]).AbsXY); + Assert.AreEqual("z", list[4].PathSegTypeAsLetter); } /// <summary> @@ -35,24 +35,24 @@ public void TestMultipleMovetosAbs() { SvgPathSegList list = new SvgPathSegList("M10, 30 70-20,23 -12", false); - Assertion.AssertEquals(3, list.NumberOfItems); - Assertion.AssertEquals("M", list[0].PathSegTypeAsLetter); - Assertion.AssertEquals(new PointF(10,30), ((SvgPathSegMovetoAbs)list[0]).AbsXY); - Assertion.AssertEquals("L", list[1].PathSegTypeAsLetter); - Assertion.AssertEquals(new PointF(70,-20), ((SvgPathSegLinetoAbs)list[1]).AbsXY); - Assertion.AssertEquals("L", list[2].PathSegTypeAsLetter); - Assertion.AssertEquals(new PointF(23,-12), ((SvgPathSegLinetoAbs)list[2]).AbsXY); + Assert.AreEqual(3, list.NumberOfItems); + Assert.AreEqual("M", list[0].PathSegTypeAsLetter); + Assert.AreEqual(new PointF(10,30), ((SvgPathSegMovetoAbs)list[0]).AbsXY); + Assert.AreEqual("L", list[1].PathSegTypeAsLetter); + Assert.AreEqual(new PointF(70,-20), ((SvgPathSegLinetoAbs)list[1]).AbsXY); + Assert.AreEqual("L", list[2].PathSegTypeAsLetter); + Assert.AreEqual(new PointF(23,-12), ((SvgPathSegLinetoAbs)list[2]).AbsXY); } [Test] public void TestMultipleMovetosRel() { SvgPathSegList list = new SvgPathSegList("m10,30 20,20", false); - Assertion.AssertEquals(2, list.NumberOfItems); - Assertion.AssertEquals("m", list[0].PathSegTypeAsLetter); - Assertion.AssertEquals(new PointF(10,30), ((SvgPathSegMovetoRel)list[0]).AbsXY); - Assertion.AssertEquals("l", list[1].PathSegTypeAsLetter); - Assertion.AssertEquals(new PointF(30,50), ((SvgPathSegLinetoRel)list[1]).AbsXY); + Assert.AreEqual(2, list.NumberOfItems); + Assert.AreEqual("m", list[0].PathSegTypeAsLetter); + Assert.AreEqual(new PointF(10,30), ((SvgPathSegMovetoRel)list[0]).AbsXY); + Assert.AreEqual("l", list[1].PathSegTypeAsLetter); + Assert.AreEqual(new PointF(30,50), ((SvgPathSegLinetoRel)list[1]).AbsXY); } #endregion @@ -62,11 +62,11 @@ { SvgPathSegList list = new SvgPathSegList("M10,10L100,10,100,100,10,100z", false); - Assertion.AssertEquals(270, ((SvgPathSeg)list[1]).StartAngle); - Assertion.AssertEquals(90, ((SvgPathSeg)list[1]).EndAngle); + Assert.AreEqual(270, ((SvgPathSeg)list[1]).StartAngle); + Assert.AreEqual(90, ((SvgPathSeg)list[1]).EndAngle); - Assertion.AssertEquals(180, ((SvgPathSeg)list[4]).StartAngle); - Assertion.AssertEquals(0, ((SvgPathSeg)list[4]).EndAngle); + Assert.AreEqual(180, ((SvgPathSeg)list[4]).StartAngle); + Assert.AreEqual(0, ((SvgPathSeg)list[4]).EndAngle); } private bool floatsTest(string label, float f1, float f2) @@ -75,7 +75,7 @@ if(!ret) { // this will allways fail giving a nice output message - Assertion.AssertEquals(label, f1, f2); + Assert.AreEqual(f1, f2, label); } return ret; } @@ -165,7 +165,7 @@ public void TestEmptyList() { SvgPathSegList list = getEmptyList(); - Assertion.AssertEquals(0, list.NumberOfItems); + Assert.AreEqual(0, list.NumberOfItems); } @@ -174,8 +174,8 @@ { SvgPathSegList list = getEmptyList(); list.AppendItem(getLineto()); - Assertion.AssertEquals(1, list.NumberOfItems); - Assertion.AssertEquals(SvgPathSegType.LineToAbs, list[0].PathSegType); + Assert.AreEqual(1, list.NumberOfItems); + Assert.AreEqual(SvgPathSegType.LineToAbs, list[0].PathSegType); } [Test] @@ -183,10 +183,10 @@ { SvgPathSegList list = getNonEmptyList(); list.RemoveItem(1); - Assertion.AssertEquals(2, list.NumberOfItems); - Assertion.AssertEquals(0, ((SvgPathSeg)list[0]).Index); - Assertion.AssertEquals(1, ((SvgPathSeg)list[1]).Index); - Assertion.AssertEquals(SvgPathSegType.LineToRel, list[1].PathSegType); + Assert.AreEqual(2, list.NumberOfItems); + Assert.AreEqual(0, ((SvgPathSeg)list[0]).Index); + Assert.AreEqual(1, ((SvgPathSeg)list[1]).Index); + Assert.AreEqual(SvgPathSegType.LineToRel, list[1].PathSegType); } [Test] @@ -194,8 +194,8 @@ { SvgPathSegList list = getNonEmptyList(); list.ReplaceItem(getLineto(), 0); - Assertion.AssertEquals(3, list.NumberOfItems); - Assertion.AssertEquals(SvgPathSegType.LineToAbs, list[0].PathSegType); + Assert.AreEqual(3, list.NumberOfItems); + Assert.AreEqual(SvgPathSegType.LineToAbs, list[0].PathSegType); } [Test] @@ -203,14 +203,14 @@ { SvgPathSegList list = getNonEmptyList(); list.InsertItemBefore(getLineto(), 1); - Assertion.AssertEquals(4, list.NumberOfItems); + Assert.AreEqual(4, list.NumberOfItems); - Assertion.AssertEquals(1, ((SvgPathSeg)list[1]).Index); - Assertion.AssertEquals(2, ((SvgPathSeg)list[2]).Index); - Assertion.AssertEquals(SvgPathSegType.MoveToAbs, list[0].PathSegType); - Assertion.AssertEquals(SvgPathSegType.LineToAbs, list[1].PathSegType); - Assertion.AssertEquals(SvgPathSegType.LineToAbs, list[2].PathSegType); - Assertion.AssertEquals(SvgPathSegType.LineToRel, list[3].PathSegType); + Assert.AreEqual(1, ((SvgPathSeg)list[1]).Index); + Assert.AreEqual(2, ((SvgPathSeg)list[2]).Index); + Assert.AreEqual(SvgPathSegType.MoveToAbs, list[0].PathSegType); + Assert.AreEqual(SvgPathSegType.LineToAbs, list[1].PathSegType); + Assert.AreEqual(SvgPathSegType.LineToAbs, list[2].PathSegType); + Assert.AreEqual(SvgPathSegType.LineToRel, list[3].PathSegType); } [Test] @@ -219,9 +219,9 @@ SvgPathSegList list = getNonEmptyList(); list.Initialize(getLineto()); - Assertion.AssertEquals(1, list.NumberOfItems); - Assertion.AssertEquals(SvgPathSegType.LineToAbs, list[0].PathSegType); - Assertion.AssertEquals(0, ((SvgPathSeg)list[0]).Index); + Assert.AreEqual(1, list.NumberOfItems); + Assert.AreEqual(SvgPathSegType.LineToAbs, list[0].PathSegType); + Assert.AreEqual(0, ((SvgPathSeg)list[0]).Index); } [Test] @@ -249,7 +249,7 @@ string d = "M1,2L3,4l5,6H7h8V9v0zC1,2,3,4,5,6c7,8,9,0,1,2S3,4,5,6s7,8,9,0Q1,2,3,4q5,6,7,8T9,0t1,2A3,4,5,1,0,8,9a0,1,2,0,1,5,6"; SvgPathSegList list = new SvgPathSegList(d, false); - Assertion.AssertEquals(d, list.PathText); + Assert.AreEqual(d, list.PathText); } #endregion |
