From: Jeff R. <jef...@us...> - 2005-11-20 20:42:33
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Color In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1906/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Color Modified Files: SvgColorTests.cs Log Message: Project wide fixes to eliminate obsolete NUnit calls, minor test related fixes Index: SvgColorTests.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Color/SvgColorTests.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- SvgColorTests.cs 28 Jun 2003 20:37:31 -0000 1.3 +++ SvgColorTests.cs 20 Nov 2005 20:42:23 -0000 1.4 @@ -48,10 +48,10 @@ { SvgColor color = _createColor("rgb(12,234 , 121)"); color.SetColor(SvgColorType.RgbColor, "#ff00ff", ""); - Assertion.AssertEquals("rgb(255,0,255)", color.CssText); + Assert.AreEqual("rgb(255,0,255)", color.CssText); color.SetColor(SvgColorType.CurrentColor, null, null); - Assertion.AssertEquals("currentColor", color.CssText); + Assert.AreEqual("currentColor", color.CssText); } [Test] @@ -59,7 +59,7 @@ { SvgColor color = _createColor("rgb(12,234 , 121)"); color.SetRgbColor("#ff0000"); - Assertion.AssertEquals("rgb(255,0,0)", color.CssText); + Assert.AreEqual("rgb(255,0,0)", color.CssText); } [Test] @@ -73,7 +73,7 @@ { // should allways be false SvgColor color = _createColor("rgb(12,234 , 121)"); - Assertion.AssertEquals(false, color.ReadOnly); + Assert.AreEqual(false, color.ReadOnly); } [Test] @@ -82,7 +82,7 @@ { SvgColor color = _createColor("rgb(12,234 , 121)"); color.SetRgbColorIccColor("#ff0000", "somename"); - Assertion.AssertEquals("rgb(255,0,0) icc-color(somename)", color.CssText); + Assert.AreEqual("rgb(255,0,0) icc-color(somename)", color.CssText); } @@ -90,16 +90,16 @@ public void TestColorType() { SvgColor color = _createColor("rgb(12,234 , 121)"); - Assertion.AssertEquals(SvgColorType.RgbColor, color.ColorType); + Assert.AreEqual(SvgColorType.RgbColor, color.ColorType); color = _createColor("currentColor"); - Assertion.AssertEquals(SvgColorType.CurrentColor, color.ColorType); + Assert.AreEqual(SvgColorType.CurrentColor, color.ColorType); color.SetColor(SvgColorType.RgbColor, "rgb(80%, 50%, 12)", null); - Assertion.AssertEquals(SvgColorType.RgbColor, color.ColorType); + Assert.AreEqual(SvgColorType.RgbColor, color.ColorType); color.SetColor(SvgColorType.RgbColorIccColor, "rgb(80%, 50%, 12)", "icc-color(somename)"); - Assertion.AssertEquals(SvgColorType.RgbColorIccColor, color.ColorType); + Assert.AreEqual(SvgColorType.RgbColorIccColor, color.ColorType); } public override void TestCssReadOnly() @@ -271,9 +271,9 @@ SvgColor color = _createColor(name); SvgColor color2 = _createColor(hexColor); - Assertion.AssertEquals(name + " red", color2.RgbColor.Red.GetFloatValue(CssPrimitiveType.Number), color.RgbColor.Red.GetFloatValue(CssPrimitiveType.Number)); - Assertion.AssertEquals(name + " green", color2.RgbColor.Green.GetFloatValue(CssPrimitiveType.Number), color.RgbColor.Green.GetFloatValue(CssPrimitiveType.Number)); - Assertion.AssertEquals(name + " blue", color2.RgbColor.Blue.GetFloatValue(CssPrimitiveType.Number), color.RgbColor.Blue.GetFloatValue(CssPrimitiveType.Number)); + Assert.AreEqual(color2.RgbColor.Red.GetFloatValue(CssPrimitiveType.Number), color.RgbColor.Red.GetFloatValue(CssPrimitiveType.Number), name + " red"); + Assert.AreEqual(color2.RgbColor.Green.GetFloatValue(CssPrimitiveType.Number), color.RgbColor.Green.GetFloatValue(CssPrimitiveType.Number), name + " green"); + Assert.AreEqual(color2.RgbColor.Blue.GetFloatValue(CssPrimitiveType.Number), color.RgbColor.Blue.GetFloatValue(CssPrimitiveType.Number), name + " blue"); } } } |