Merge pull request #2274 from esdrubal/udpclientreceive

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

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/ColorTranslator.cs b/mcs/class/System.Drawing/Test/System.Drawing/ColorTranslator.cs
index b8dc5f93be72b8f16569da1d6f2f76d2a7c93546..27ee0f55305493680b0b4796047f2bdd5a171aaf 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/ColorTranslator.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/ColorTranslator.cs
@@ -1,7 +1,7 @@
 //
 // ColorTranslator class testing unit
 //
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2006-2007 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -32,7 +32,7 @@ namespace MonoTests.System.Drawing {
 
        [TestFixture]
        [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)]
-       public class ColorTranslatorFixture {
+       public class ColorTranslatorTest {
 
                [Test]
                public void FromHtml_Null ()
@@ -46,6 +46,17 @@ namespace MonoTests.System.Drawing {
                        Assert.AreEqual (0, ColorTranslator.FromHtml (String.Empty).ToArgb ());
                }
 
+               [Test]
+               public void FromHtml_KnownValues ()
+               {
+                       Assert.AreEqual (SystemColors.Control, ColorTranslator.FromHtml ("buttonface"), "buttonface");
+                       Assert.AreEqual (SystemColors.ActiveCaptionText, ColorTranslator.FromHtml ("CAPTIONTEXT"), "captiontext");
+                       Assert.AreEqual (SystemColors.ControlDarkDark, ColorTranslator.FromHtml ("threedDARKshadow"), "threeddarkshadow");
+                       Assert.AreEqual (SystemColors.Desktop, ColorTranslator.FromHtml ("background"), "background");
+                       Assert.AreEqual (SystemColors.ControlText, ColorTranslator.FromHtml ("ButtonText"), "buttontext");
+                       Assert.AreEqual (SystemColors.Info, ColorTranslator.FromHtml ("infobackground"), "infobackground");
+               }
+
                [Test]
                public void FromHtml_Int ()
                {
@@ -60,16 +71,20 @@ namespace MonoTests.System.Drawing {
                        Assert.AreEqual (0, ColorTranslator.FromHtml ("#0").ToArgb (), "#0");
                        Assert.AreEqual (1, ColorTranslator.FromHtml ("#1").ToArgb (), "#1");
                        Assert.AreEqual (255, ColorTranslator.FromHtml ("#FF").ToArgb (), "#FF");
+                       Assert.AreEqual (-15654349, ColorTranslator.FromHtml ("#123").ToArgb (), "#123");
+                       Assert.AreEqual (-1, ColorTranslator.FromHtml ("#FFF").ToArgb (), "#FFF");
                        Assert.AreEqual (65535, ColorTranslator.FromHtml ("#FFFF").ToArgb (), "#FFFF");
+                       Assert.AreEqual (-15584170, ColorTranslator.FromHtml ("#123456").ToArgb (), "#123456");
                        Assert.AreEqual (-1, ColorTranslator.FromHtml ("#FFFFFF").ToArgb (), "#FFFFFF");
+                       Assert.AreEqual (305419896, ColorTranslator.FromHtml ("#12345678").ToArgb (), "#12345678");
                        Assert.AreEqual (-1, ColorTranslator.FromHtml ("#FFFFFFFF").ToArgb (), "#FFFFFFFF");
+                       
+                       Assert.AreEqual (Color.White, ColorTranslator.FromHtml ("#FFFFFF"), "used to resolve to some KnownColor");
+                       Assert.AreEqual (Color.White, ColorTranslator.FromHtml ("0xFFFFFF"), "used to resolve to some KnownColor");
                }
 
                [Test]
                [ExpectedException (typeof (Exception))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void FromHtml_PoundNegative ()
                {
                        ColorTranslator.FromHtml ("#-1");
@@ -84,10 +99,7 @@ namespace MonoTests.System.Drawing {
 
                [Test]
                [ExpectedException (typeof (Exception))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
-               public void FromHtml_Unkown ()
+               public void FromHtml_Unknown ()
                {
                        ColorTranslator.FromHtml ("unknown-color-test");
                }
@@ -145,6 +157,12 @@ SystemColors.MenuText, SystemColors.ScrollBar,
                                Assert.AreEqual (colors[i], ColorTranslator.FromHtml (htmlColors [i]));
                }
 
+               [Test] // 340917
+               public void FromHtml_LightGrey ()
+               {
+                       Assert.AreEqual (Color.LightGray, ColorTranslator.FromHtml(ColorTranslator.ToHtml(Color.LightGray)));
+               }
+
                [Test]
                public void FromOle ()
                {