2007-03-15 Sebastien Pouliot <sebastien@ximian.com>

	* ColorTranslator.cs: Add two other #hex cases. Fix typo.

svn path=/trunk/mcs/; revision=74354

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog b/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog
index 70c7331e1320734fb516a93d66a6c9c61623e2b2..92bbff92bddcfc524911c3b473943676f4afc115 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-15  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * ColorTranslator.cs: Add two other #hex cases. Fix typo.
+
 2007-03-14  Sebastien Pouliot  <sebastien@ximian.com>
 
        * TestImage.cs: Add test cases for loading invalid files as an Image.

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/ColorTranslator.cs b/mcs/class/System.Drawing/Test/System.Drawing/ColorTranslator.cs
index 336e102e2a1749316122ef4d0789ee900a06a6df..ee63c40d7fcd8e94da42bb746c39f42bd690a244 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
@@ -61,7 +61,9 @@ namespace MonoTests.System.Drawing {
                        Assert.AreEqual (1, ColorTranslator.FromHtml ("#1").ToArgb (), "#1");
                        Assert.AreEqual (255, ColorTranslator.FromHtml ("#FF").ToArgb (), "#FF");
                        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");
                }
 
@@ -87,7 +89,7 @@ namespace MonoTests.System.Drawing {
 #if TARGET_JVM
                [Category ("NotWorking")]
 #endif
-               public void FromHtml_Unkown ()
+               public void FromHtml_Unknown ()
                {
                        ColorTranslator.FromHtml ("unknown-color-test");
                }