Menu
▾
▴
[svg#-cvs] SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Gradients and Patterns SvgGradientElementTests.cs,1.2,1.3 SvgLinearGradientElementTests.cs,1.2,1.3 SvgPatternElementTests.cs,1.3,1.4 SvgRadialGradientElementTests.cs,1.2,1.3
|
From: Jeff R. <jef...@us...> - 2005-11-20 20:42:35
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Gradients and Patterns In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1906/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Gradients and Patterns Modified Files: SvgGradientElementTests.cs SvgLinearGradientElementTests.cs SvgPatternElementTests.cs SvgRadialGradientElementTests.cs Log Message: Project wide fixes to eliminate obsolete NUnit calls, minor test related fixes Index: SvgRadialGradientElementTests.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Gradients and Patterns/SvgRadialGradientElementTests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SvgRadialGradientElementTests.cs 23 Apr 2003 22:41:28 -0000 1.2 +++ SvgRadialGradientElementTests.cs 20 Nov 2005 20:42:24 -0000 1.3 @@ -26,11 +26,11 @@ { SvgRadialGradientElement elm = Util.GetXmlElement("<radialGradient cx='1' cy='2' r='3' fx='4' fy='5' />", "", "radialGradient") as SvgRadialGradientElement; - Assertion.AssertEquals("cx", 1, elm.Cx.AnimVal.Value); - Assertion.AssertEquals("cy", 2, elm.Cy.AnimVal.Value); - Assertion.AssertEquals("r", 3, elm.R.AnimVal.Value); - Assertion.AssertEquals("fx", 4, elm.Fx.AnimVal.Value); - Assertion.AssertEquals("fy", 5, elm.Fy.AnimVal.Value); + Assert.AreEqual(1, elm.Cx.AnimVal.Value, "cx"); + Assert.AreEqual(2, elm.Cy.AnimVal.Value, "cy"); + Assert.AreEqual(3, elm.R.AnimVal.Value, "r"); + Assert.AreEqual(4, elm.Fx.AnimVal.Value, "fx"); + Assert.AreEqual(5, elm.Fy.AnimVal.Value, "fy"); } [Test] @@ -38,8 +38,8 @@ { SvgRadialGradientElement elm = Util.GetXmlElement("<radialGradient fy='5' />", "", "radialGradient") as SvgRadialGradientElement; - Assertion.AssertEquals("fx", 5, elm.Fx.AnimVal.Value); - Assertion.AssertEquals("fy", 5, elm.Fy.AnimVal.Value); + Assert.AreEqual(5, elm.Fx.AnimVal.Value, "fx"); + Assert.AreEqual(5, elm.Fy.AnimVal.Value, "fy"); } } Index: SvgPatternElementTests.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Gradients and Patterns/SvgPatternElementTests.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- SvgPatternElementTests.cs 23 Apr 2003 22:41:28 -0000 1.3 +++ SvgPatternElementTests.cs 20 Nov 2005 20:42:24 -0000 1.4 @@ -27,58 +27,60 @@ { SvgPatternElement elm = Util.GetXmlElement("<pattern x='1' y='2' width='3' height='4' />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals("x", 1, elm.X.AnimVal.Value); - Assertion.AssertEquals("y", 2, elm.Y.AnimVal.Value); - Assertion.AssertEquals("width", 3, elm.Width.AnimVal.Value); - Assertion.AssertEquals("height", 4, elm.Height.AnimVal.Value); + Assert.AreEqual(1, elm.X.AnimVal.Value, "x"); + Assert.AreEqual(2, elm.Y.AnimVal.Value, "y"); + Assert.AreEqual(3, elm.Width.AnimVal.Value, "width"); + Assert.AreEqual(4, elm.Height.AnimVal.Value,"height"); } [Test] public void TestPatternUnits() { SvgPatternElement elm = Util.GetXmlElement("<pattern patternUnits='userSpaceOnUse' />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals(SvgUnitType.UserSpaceOnUse, elm.PatternUnits.AnimVal); + Assert.AreEqual((ushort)SvgUnitType.UserSpaceOnUse, elm.PatternUnits.AnimVal); elm = Util.GetXmlElement("<pattern patternUnits='objectBoundingBox' />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals(SvgUnitType.ObjectBoundingBox, elm.PatternUnits.AnimVal); + Assert.AreEqual((ushort)SvgUnitType.ObjectBoundingBox, elm.PatternUnits.AnimVal); elm = Util.GetXmlElement("<pattern />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals(SvgUnitType.ObjectBoundingBox, elm.PatternUnits.AnimVal); + Assert.AreEqual((ushort)SvgUnitType.ObjectBoundingBox, elm.PatternUnits.AnimVal); } [Test] public void TestPatternContentUnits() { SvgPatternElement elm = Util.GetXmlElement("<pattern patternContentUnits='userSpaceOnUse' />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals(SvgUnitType.UserSpaceOnUse, elm.PatternContentUnits.AnimVal); + Assert.AreEqual((ushort)SvgUnitType.UserSpaceOnUse, elm.PatternContentUnits.AnimVal); elm = Util.GetXmlElement("<pattern patternContentUnits='objectBoundingBox' />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals(SvgUnitType.ObjectBoundingBox, elm.PatternContentUnits.AnimVal); + Assert.AreEqual((ushort)SvgUnitType.ObjectBoundingBox, elm.PatternContentUnits.AnimVal); elm = Util.GetXmlElement("<pattern />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals(SvgUnitType.UserSpaceOnUse, elm.PatternContentUnits.AnimVal); + Assert.AreEqual((ushort)SvgUnitType.UserSpaceOnUse, elm.PatternContentUnits.AnimVal); } [Test] public void TestPatternTransform() { SvgPatternElement elm = Util.GetXmlElement("<pattern patternTransform='translate(1,1) rotate(34)' />", "", "pattern") as SvgPatternElement; - Assertion.Assert(elm.PatternTransform is ISvgAnimatedTransformList); - Assertion.AssertEquals(2, elm.PatternTransform.AnimVal.NumberOfItems); + ISvgAnimatedTransformList satl = elm.PatternTransform as ISvgAnimatedTransformList; + Assert.IsNotNull(satl); + Assert.AreEqual(2, elm.PatternTransform.AnimVal.NumberOfItems); elm = Util.GetXmlElement("<pattern />", "", "pattern") as SvgPatternElement; - Assertion.Assert(elm.PatternTransform is ISvgAnimatedTransformList); - Assertion.AssertEquals(0, elm.PatternTransform.AnimVal.NumberOfItems); + satl = elm.PatternTransform as ISvgAnimatedTransformList; + Assert.IsNotNull(satl); + Assert.AreEqual(0, elm.PatternTransform.AnimVal.NumberOfItems); } [Test] public void TestHref() { SvgPatternElement elm = Util.GetXmlElement("<pattern xlink:href='kalle.svg#someOtherPattern' />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals("kalle.svg#someOtherPattern", elm.Href.AnimVal); + Assert.AreEqual("kalle.svg#someOtherPattern", elm.Href.AnimVal); elm = Util.GetXmlElement("<pattern />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals("", elm.Href.AnimVal); + Assert.AreEqual("", elm.Href.AnimVal); } [Test] @@ -86,17 +88,17 @@ { SvgPatternElement elm = Util.GetXmlElement("<pattern viewBox='1 2 3 4' />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals(1, elm.ViewBox.AnimVal.X); - Assertion.AssertEquals(2, elm.ViewBox.AnimVal.Y); - Assertion.AssertEquals(3, elm.ViewBox.AnimVal.Width); - Assertion.AssertEquals(4, elm.ViewBox.AnimVal.Height); + Assert.AreEqual(1, elm.ViewBox.AnimVal.X); + Assert.AreEqual(2, elm.ViewBox.AnimVal.Y); + Assert.AreEqual(3, elm.ViewBox.AnimVal.Width); + Assert.AreEqual(4, elm.ViewBox.AnimVal.Height); elm = Util.GetXmlElement("<pattern />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals(0, elm.ViewBox.AnimVal.X); - Assertion.AssertEquals(0, elm.ViewBox.AnimVal.Y); - Assertion.AssertEquals(0, elm.ViewBox.AnimVal.Width); - Assertion.AssertEquals(0, elm.ViewBox.AnimVal.Height); + Assert.AreEqual(0, elm.ViewBox.AnimVal.X); + Assert.AreEqual(0, elm.ViewBox.AnimVal.Y); + Assert.AreEqual(0, elm.ViewBox.AnimVal.Width); + Assert.AreEqual(0, elm.ViewBox.AnimVal.Height); } [Test] @@ -104,13 +106,13 @@ { SvgPatternElement elm = Util.GetXmlElement("<pattern preserveAspectRatio='xMidYMin slice' />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals(SvgPreserveAspectRatioType.XMidYMin, elm.PreserveAspectRatio.AnimVal.Align); - Assertion.AssertEquals(SvgMeetOrSlice.Slice, elm.PreserveAspectRatio.AnimVal.MeetOrSlice); + Assert.AreEqual(SvgPreserveAspectRatioType.XMidYMin, elm.PreserveAspectRatio.AnimVal.Align); + Assert.AreEqual(SvgMeetOrSlice.Slice, elm.PreserveAspectRatio.AnimVal.MeetOrSlice); elm = Util.GetXmlElement("<pattern />", "", "pattern") as SvgPatternElement; - Assertion.AssertEquals(SvgPreserveAspectRatioType.XMidYMid, elm.PreserveAspectRatio.AnimVal.Align); - Assertion.AssertEquals(SvgMeetOrSlice.Meet, elm.PreserveAspectRatio.AnimVal.MeetOrSlice); + Assert.AreEqual(SvgPreserveAspectRatioType.XMidYMid, elm.PreserveAspectRatio.AnimVal.Align); + Assert.AreEqual(SvgMeetOrSlice.Meet, elm.PreserveAspectRatio.AnimVal.MeetOrSlice); } } } Index: SvgGradientElementTests.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Gradients and Patterns/SvgGradientElementTests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SvgGradientElementTests.cs 23 Apr 2003 22:41:28 -0000 1.2 +++ SvgGradientElementTests.cs 20 Nov 2005 20:42:24 -0000 1.3 @@ -14,25 +14,27 @@ public void TestGradientUnits() { SvgGradientElement elm = Util.GetXmlElement("<linearGradient gradientUnits='userSpaceOnUse' />", "", "linearGradient") as SvgGradientElement; - Assertion.AssertEquals(SvgUnitType.UserSpaceOnUse, elm.GradientUnits.AnimVal); + Assert.AreEqual((ushort)SvgUnitType.UserSpaceOnUse, elm.GradientUnits.AnimVal); elm = Util.GetXmlElement("<linearGradient gradientUnits='objectBoundingBox' />", "", "linearGradient") as SvgGradientElement; - Assertion.AssertEquals(SvgUnitType.ObjectBoundingBox, elm.GradientUnits.AnimVal); + Assert.AreEqual((ushort)SvgUnitType.ObjectBoundingBox, elm.GradientUnits.AnimVal); elm = Util.GetXmlElement("<linearGradient />", "", "linearGradient") as SvgGradientElement; - Assertion.AssertEquals(SvgUnitType.ObjectBoundingBox, elm.GradientUnits.AnimVal); + Assert.AreEqual((ushort)SvgUnitType.ObjectBoundingBox, elm.GradientUnits.AnimVal); } [Test] public void TestGradientTransform() { SvgGradientElement elm = Util.GetXmlElement("<linearGradient gradientTransform='translate(1,1) rotate(34)' />", "", "linearGradient") as SvgGradientElement; - Assertion.Assert(elm.GradientTransform is ISvgAnimatedTransformList); - Assertion.AssertEquals(2, elm.GradientTransform.AnimVal.NumberOfItems); + ISvgAnimatedTransformList satl = elm.GradientTransform as ISvgAnimatedTransformList; + Assert.IsNotNull(satl); + Assert.AreEqual(2, elm.GradientTransform.AnimVal.NumberOfItems); elm = Util.GetXmlElement("<linearGradient />", "", "linearGradient") as SvgGradientElement; - Assertion.Assert(elm.GradientTransform is ISvgAnimatedTransformList); - Assertion.AssertEquals(0, elm.GradientTransform.AnimVal.NumberOfItems); + satl = elm.GradientTransform as ISvgAnimatedTransformList; + Assert.IsNotNull(satl); + Assert.AreEqual(0, elm.GradientTransform.AnimVal.NumberOfItems); } @@ -40,36 +42,36 @@ public void TestSpreadMethod() { SvgGradientElement elm = Util.GetXmlElement("<linearGradient spreadMethod='reflect' />", "", "linearGradient") as SvgGradientElement; - Assertion.AssertEquals(SvgSpreadMethod.Reflect, elm.SpreadMethod.AnimVal); + Assert.AreEqual((ushort)SvgSpreadMethod.Reflect, elm.SpreadMethod.AnimVal); elm = Util.GetXmlElement("<linearGradient spreadMethod='repeat' />", "", "linearGradient") as SvgGradientElement; - Assertion.AssertEquals(SvgSpreadMethod.Repeat, elm.SpreadMethod.AnimVal); + Assert.AreEqual((ushort)SvgSpreadMethod.Repeat, elm.SpreadMethod.AnimVal); elm = Util.GetXmlElement("<linearGradient spreadMethod='pad' />", "", "linearGradient") as SvgGradientElement; - Assertion.AssertEquals(SvgSpreadMethod.Pad, elm.SpreadMethod.AnimVal); + Assert.AreEqual((ushort)SvgSpreadMethod.Pad, elm.SpreadMethod.AnimVal); elm = Util.GetXmlElement("<linearGradient />", "", "linearGradient") as SvgGradientElement; - Assertion.AssertEquals(SvgSpreadMethod.Pad, elm.SpreadMethod.AnimVal); + Assert.AreEqual((ushort)SvgSpreadMethod.Pad, elm.SpreadMethod.AnimVal); } [Test] public void TestHref() { SvgGradientElement elm = Util.GetXmlElement("<linearGradient xlink:href='kalle.svg#someOtherGradient' />", "", "linearGradient") as SvgGradientElement; - Assertion.AssertEquals("kalle.svg#someOtherGradient", elm.Href.AnimVal); + Assert.AreEqual("kalle.svg#someOtherGradient", elm.Href.AnimVal); elm = Util.GetXmlElement("<linearGradient />", "", "linearGradient") as SvgGradientElement; - Assertion.AssertEquals("", elm.Href.AnimVal); + Assert.AreEqual("", elm.Href.AnimVal); } [Test] public void TestStopsCount() { SvgGradientElement elm = Util.GetXmlElement("<linearGradient><stop offset='5%' stop-color='blue' /><stop offset='10%' stop-color='red' /></linearGradient>", "", "linearGradient") as SvgGradientElement; - Assertion.AssertEquals(2, elm.Stops.Count); + Assert.AreEqual(2, elm.Stops.Count); elm = Util.GetXmlElement("<linearGradient />", "", "linearGradient") as SvgGradientElement; - Assertion.AssertEquals(0, elm.Stops.Count); + Assert.AreEqual(0, elm.Stops.Count); } } } Index: SvgLinearGradientElementTests.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Gradients and Patterns/SvgLinearGradientElementTests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SvgLinearGradientElementTests.cs 23 Apr 2003 22:41:28 -0000 1.2 +++ SvgLinearGradientElementTests.cs 20 Nov 2005 20:42:24 -0000 1.3 @@ -27,10 +27,10 @@ { SvgLinearGradientElement elm = Util.GetXmlElement("<linearGradient x1='1' y1='2' x2='3' y2='4' />", "", "linearGradient") as SvgLinearGradientElement; - Assertion.AssertEquals("x1", 1, elm.X1.AnimVal.Value); - Assertion.AssertEquals("y1", 2, elm.Y1.AnimVal.Value); - Assertion.AssertEquals("x2", 3, elm.X2.AnimVal.Value); - Assertion.AssertEquals("y2", 4, elm.Y2.AnimVal.Value); + Assert.AreEqual(1, elm.X1.AnimVal.Value, "x1"); + Assert.AreEqual(2, elm.Y1.AnimVal.Value, "y1"); + Assert.AreEqual(3, elm.X2.AnimVal.Value, "x2"); + Assert.AreEqual(4, elm.Y2.AnimVal.Value, "y2"); } } |
