* PEAPI.cs: Clean up indentation. Split into ...

[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 7576f2f4eeb2708f7c7126d36b8bd9f8261e51f3..16f0b4a0056a39f63f1242ea994530f6bb74ec33 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs
@@ -7,6 +7,29 @@
 //
 // (C) 2004 Ximian, Inc.  http://www.ximian.com
 //
+
+//
+// Copyright (C) 2004 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
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -15,10 +38,12 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 using System.Runtime.InteropServices;
+using System.Security.Permissions;
 
 namespace MonoTests.System.Drawing{
 
-       [TestFixture]   
+       [TestFixture]
+       [SecurityPermission (SecurityAction.Deny, UnmanagedCode = true)]
        public class TestBitmap {
                
                [TearDown]
@@ -30,7 +55,7 @@ namespace MonoTests.System.Drawing{
                
                }
                        
-               //[Test]
+               [Test]
                public void TestPixels() 
                {               
                        // Tests GetSetPixel/SetPixel                   
@@ -80,8 +105,6 @@ namespace MonoTests.System.Drawing{
                        return sRslt;
                }
                
-       
-
                //[Test]
                public void MakeTransparent() 
                {
@@ -89,7 +112,6 @@ namespace MonoTests.System.Drawing{
                        string sOutFile =  getOutSubDir() + "transparent.bmp";
                                                
                        Bitmap  bmp = new Bitmap(sInFile);
-                       Console.WriteLine("Bitmap loaded OK", bmp != null);
                                        
                        bmp.MakeTransparent();
                        bmp.Save(sOutFile);                                                     
@@ -100,7 +122,7 @@ namespace MonoTests.System.Drawing{
                        Assert.AreEqual (Color.Black.B, color.B);                                                                               
                }
                
-               //[Test]
+               [Test]
                public void Clone()
                {
                        string sInFile = getInFile ("bitmaps/almogaver24bits.bmp");
@@ -120,7 +142,7 @@ namespace MonoTests.System.Drawing{
                        Assert.AreEqual (colororg50, colornew50);                               
                }       
                
-               //[Test]
+               [Test]
                public void CloneImage()
                {
                        string sInFile = getInFile ("bitmaps/almogaver24bits.bmp");                     
@@ -130,11 +152,11 @@ namespace MonoTests.System.Drawing{
                        
                        Assert.AreEqual (bmp.Width, bmpNew.Width);
                        Assert.AreEqual (bmp.Height, bmpNew.Height);            
-                       Assert.AreEqual (bmp.PixelFormat, bmpNew.PixelFormat);                  
+                       Assert.AreEqual (bmp.PixelFormat, bmpNew.PixelFormat);
                        
                }       
 
-               //[Test]
+               [Test]
                public void Frames()
                {
                        string sInFile = getInFile ("bitmaps/almogaver24bits.bmp");                     
@@ -145,6 +167,13 @@ namespace MonoTests.System.Drawing{
                        Assert.AreEqual (1, cnt);                                                               
                        Assert.AreEqual (0, active);                                                                                    
                }
+               
+               [Test]
+               [ExpectedException (typeof (ArgumentException))]
+               public void FileDoesNotExists ()
+               {                       
+                       Bitmap  bmp = new Bitmap ("FileDoesNotExists.jpg");                     
+               }
 
                static string ByteArrayToString(byte[] arrInput)
                {
@@ -186,7 +215,7 @@ namespace MonoTests.System.Drawing{
                        Rotate bitmap in diffent ways, and check the result
                        pixels using MD5
                */
-               //[Test]
+               [Test]
                public void Rotate()
                {
                        string sInFile = getInFile ("bitmaps/almogaver24bits.bmp");