2006-04-25 Peter Dennis Bartok <pbartok@novell.com>

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

diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
index 9e5f70a1d2d8be73760246e181fea6eae80e614b..cee75cb8f6d47cc4a403b5c914f3fb244eb86e56 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
@@ -36,12 +36,14 @@ using System.Drawing.Imaging;
 using NUnit.Framework;
 using System.IO;
 using System.Security.Cryptography;
+using System.Security.Permissions;
 using System.Text;
 
 namespace MonoTests.System.Drawing
 {
 
-       [TestFixture]   
+       [TestFixture]
+       [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)]
        public class TestBmpCodec
        {
                
@@ -80,17 +82,20 @@ namespace MonoTests.System.Drawing
                
                /* Checks bitmap features on a know 24-bits bitmap */
                [Test]
+#if TARGET_JVM
+               [NUnit.Framework.Category ("NotWorking")]
+#endif
+               [Category("NotWorking")]
                public void Bitmap24bitFeatures()
                {
-                       string sInFile = getInFile ("bitmaps/almogaver24bits.bmp");
-                       Console.WriteLine ("openning " + sInFile);
+                       string sInFile = getInFile ("bitmaps/almogaver24bits.bmp");                     
                        Bitmap  bmp = new Bitmap(sInFile);                                              
                        RectangleF rect;
                        GraphicsUnit unit = GraphicsUnit.World;
                        
                        rect = bmp.GetBounds(ref unit);
                        
-                       //Assert.AreEqual (PixelFormat.Format24bppRgb, bmp.PixelFormat);
+                       Assert.AreEqual (PixelFormat.Format24bppRgb, bmp.PixelFormat);
                        Assert.AreEqual (173, bmp.Width);
                        Assert.AreEqual (183, bmp.Height);              
                        
@@ -114,9 +119,8 @@ namespace MonoTests.System.Drawing
                        RectangleF rect;
                        GraphicsUnit unit = GraphicsUnit.World;
                        
-                       rect = bmp.GetBounds(ref unit);
-                       
-                       //Assert.AreEqual (PixelFormat.Format32bppArgb, bmp.PixelFormat);
+                       rect = bmp.GetBounds(ref unit); 
+
                        Assert.AreEqual (173, bmp.Width);
                        Assert.AreEqual (183, bmp.Height);