Merge pull request #1304 from slluis/mac-proxy-autoconfig

[mono.git] / mcs / class / System.Drawing / Test / System.Drawing / ColorConverter.cs

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs b/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs
index df03570ef0a9cb3e69e2115d86ff59e1ba4360ee..ff6d12c0ada4c22a2103394975990b9a395e3f8e 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs
@@ -37,8 +37,8 @@ namespace MonoTests.System.Drawing {
 
        [TestFixture]
        [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)]
-       public class ColorConverterFixture
-       {
+       public class ColorConverterTest {
+
                Color col;
                Color colnamed;
                ColorConverter colconv;
@@ -59,9 +59,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void CanConvertFrom () {
                        Assert.IsTrue (colconv.CanConvertFrom (typeof (String)), "CCF#1");
                        Assert.IsTrue (colconv.CanConvertFrom (null, typeof (String)), "CCF#1a");
@@ -92,9 +89,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFrom ()
                {
                        Color color = (Color) colconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -156,13 +150,8 @@ namespace MonoTests.System.Drawing {
                        Assert.AreEqual (Color.Empty, colconv.ConvertFrom (" "), "CF#4");
                        Assert.AreEqual (Color.Red, colconv.ConvertFrom ("Red"), "CF#5");
                        Assert.AreEqual (Color.Red, colconv.ConvertFrom (" Red "), "CF#6");
-               }
 
-               [Test]
-               [NUnit.Framework.Category ("NotWorking")]
-               public void ConvertFrom_NotWorking ()
-               {
-                       Color color = (Color) colconv.ConvertFrom (null, CultureInfo.InvariantCulture,
+                       color = (Color) colconv.ConvertFrom (null, CultureInfo.InvariantCulture,
                                "0x123");
                        Assert.AreEqual (0, color.A, "CF8#1");
                        Assert.AreEqual (0, color.R, "CF8#2");
@@ -201,9 +190,6 @@ namespace MonoTests.System.Drawing {
 
                [Test]
                [ExpectedException (typeof (Exception))]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFrom_x4 ()
                {
                        colconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@@ -249,6 +235,16 @@ namespace MonoTests.System.Drawing {
                        colconv.ConvertFrom (null, CultureInfo.InvariantCulture, 0x10);
                }
 
+               [Test]
+               public void ConvertFrom_CultureNull ()
+               {
+                       Color color = (Color) colconv.ConvertFrom (null, null, "#0x23190A44");
+                       Assert.AreEqual (35, color.A, "A");
+                       Assert.AreEqual (25, color.R, "R");
+                       Assert.AreEqual (10, color.G, "G");
+                       Assert.AreEqual (68, color.B, "B");
+               }
+
                [Test]
                public void ConvertTo ()
                {
@@ -362,9 +358,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromInvariantString_InvalidNumber ()
                {
                        try {
@@ -394,9 +387,6 @@ namespace MonoTests.System.Drawing {
                }
 
                [Test]
-#if TARGET_JVM
-               [NUnit.Framework.Category ("NotWorking")]
-#endif
                public void ConvertFromString_InvalidNumber ()
                {
                        try {