[Cleanup] Removed TARGET_JVM

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

diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs
index 435377815f437845d1a1d5bfc809d30894902e0f..d21141233081d1921366b112afdc074a646751dc 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs
@@ -47,9 +47,6 @@ namespace MonoTests.System.Drawing {
 
        [TestFixture]
        [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)]
-#if TARGET_JVM
-       [Category ("NotWorking")]
-#endif
        public class TestBitmap {
                
                [Test]
@@ -239,26 +236,17 @@ namespace MonoTests.System.Drawing {
 #if NET_2_0
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Ignore ("Bitmap.LockBits is not implemented")]
-#endif
                public void LockBits_BitmapData_Null ()
                {
-#if !TARGET_JVM
                        using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format32bppRgb)) {
                                Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height);
                                bmp.LockBits (rect, ImageLockMode.ReadWrite, PixelFormat.Format24bppRgb, null);
                        }
-#endif
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Bitmap.LockBits is not implemented")]
-#endif
                public void LockBits_32_32_BitmapData ()
                {
-#if !TARGET_JVM
                        BitmapData data = new BitmapData ();
                        using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format32bppRgb)) {
                                Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height);
@@ -269,16 +257,11 @@ namespace MonoTests.System.Drawing {
                                Assert.AreEqual (100, data.Width, "Width");
                                bmp.UnlockBits (data);
                        }
-#endif
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Bitmap.LockBits is not implemented")]
-#endif
                public void LockBits_32_24_BitmapData ()
                {
-#if !TARGET_JVM
                        BitmapData data = new BitmapData ();
                        using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format32bppRgb)) {
                                Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height);
@@ -289,16 +272,11 @@ namespace MonoTests.System.Drawing {
                                Assert.AreEqual (100, data.Width, "Width");
                                bmp.UnlockBits (data);
                        }
-#endif
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Bitmap.LockBits is not implemented")]
-#endif
                public void LockBits_24_24_BitmapData ()
                {
-#if !TARGET_JVM
                        BitmapData data = new BitmapData ();
                        using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format24bppRgb)) {
                                Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height);
@@ -309,16 +287,11 @@ namespace MonoTests.System.Drawing {
                                Assert.AreEqual (100, data.Width, "Width");
                                bmp.UnlockBits (data);
                        }
-#endif
                }
 
                [Test]
-#if TARGET_JVM
-               [Ignore ("Bitmap.LockBits is not implemented")]
-#endif
                public void LockBits_24_32_BitmapData ()
                {
-#if !TARGET_JVM
                        BitmapData data = new BitmapData ();
                        using (Bitmap bmp = new Bitmap (100, 100, PixelFormat.Format24bppRgb)) {
                                Rectangle rect = new Rectangle (0, 0, bmp.Width, bmp.Height);
@@ -329,7 +302,6 @@ namespace MonoTests.System.Drawing {
                                Assert.AreEqual (100, data.Width, "Width");
                                bmp.UnlockBits (data);
                        }
-#endif
                }
 #endif
 
@@ -634,9 +606,6 @@ namespace MonoTests.System.Drawing {
                
                [Test]
                [ExpectedException (typeof (ArgumentException))]
-#if TARGET_JVM
-               [Category ("NotWorking")]
-#endif
                public void FileDoesNotExists ()
                {                       
                        Bitmap  bmp = new Bitmap ("FileDoesNotExists.jpg");                     
@@ -675,7 +644,6 @@ namespace MonoTests.System.Drawing {
                        hash = new MD5CryptoServiceProvider().ComputeHash (pixels);
                        return ByteArrayToString (hash);
                }
-#if !TARGET_JVM
                public string RotateIndexedBmp (Bitmap src, RotateFlipType type)
                {
                        int pixels_per_byte;
@@ -726,7 +694,6 @@ namespace MonoTests.System.Drawing {
                        byte[] hash = new MD5CryptoServiceProvider().ComputeHash (pixel_data);
                        return ByteArrayToString (hash);
                }
-#endif         
                
                
                /*
@@ -749,7 +716,6 @@ namespace MonoTests.System.Drawing {
 
                }
 
-#if !TARGET_JVM
                /*
                        Rotate 1- and 4-bit bitmaps in different ways and check the
                        resulting pixels using MD5
@@ -1095,7 +1061,6 @@ namespace MonoTests.System.Drawing {
                                }
                        }
                }
-#endif         
                [Test]
                public void DefaultFormat1 ()
                {
@@ -1712,11 +1677,7 @@ namespace MonoTests.System.Drawing {
        }
 
        [TestFixture]
-#if TARGET_JVM
-       [Ignore ("Unsafe code is not supported")]
-#endif
        public class BitmapFullTrustTest {
-#if !TARGET_JVM
                [Test]
                public void BitmapIntIntIntPixelFormatIntPtrCtor ()
                {
@@ -1877,7 +1838,6 @@ namespace MonoTests.System.Drawing {
                                Assert.IsTrue (image2.RawFormat.Equals (ImageFormat.MemoryBmp), "2.RawFormat");
                        }
                }
-#endif
        }
 }