many new testcases in Color

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

diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs
index 3978edee9440b5dee02cb472480c22258288c16b..1ca794a5890789da652eebc61f2f3eec0f02445b 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.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;
@@ -17,7 +40,7 @@ namespace MonoTests.System.Drawing
 {
 
        [TestFixture]   
-       public class TestJpegCodec : Assertion 
+       public class TestJpegCodec 
        {
                
                [TearDown]
@@ -29,25 +52,13 @@ namespace MonoTests.System.Drawing
                
                }
                
-               /* Get the output directory depending on the runtime and location*/
-               internal string getOutSubDir()
-               {                               
-                       string sSub, sRslt;                     
-                       
+               /* Get suffix to add to the filename */
+               internal string getOutSufix()
+               {                       
                        if (Environment.GetEnvironmentVariable("MSNet")==null)
-                               sSub = "mono/";
-                       else
-                               sSub = "MSNet/";                        
-                       
-                       sRslt = Path.GetFullPath ("../System.Drawing/" +  sSub);
-                               
-                       if (Directory.Exists(sRslt) ==  false) 
-                               sRslt = "Test/System.Drawing/" + sSub;                                                  
-                       
-                       if (sRslt.Length > 0)
-                               if (sRslt[sRslt.Length-1] != '\\' && sRslt[sRslt.Length-1] != '/')
-                                       sRslt += "/";                                   
-                       return sRslt;
+                               return "-mono";
+                                       
+                       return "";
                }
 
                /* Get the input directory depending on the runtime*/
@@ -66,7 +77,7 @@ namespace MonoTests.System.Drawing
                }
                
                /* Checks bitmap features on a know 24-bits bitmap */
-               [Test]
+               //[Test]
                public void Bitmap24bitFeatures()
                {
                        string sInFile = getInFile ("bitmaps/nature24bits.jpg");
@@ -76,24 +87,24 @@ namespace MonoTests.System.Drawing
                        
                        rect = bmp.GetBounds(ref unit);
 
-                       AssertEquals (PixelFormat.Format24bppRgb, bmp.PixelFormat);
-                       AssertEquals (110, bmp.Width);
-                       AssertEquals (100, bmp.Height);         
+                       Assert.AreEqual (PixelFormat.Format24bppRgb, bmp.PixelFormat);
+                       Assert.AreEqual (110, bmp.Width);
+                       Assert.AreEqual (100, bmp.Height);              
                        
-                       AssertEquals (0, rect.X);
-                       AssertEquals (0, rect.Y);               
-                       AssertEquals (110, rect.Width);
-                       AssertEquals (100, rect.Height);                                        
+                       Assert.AreEqual (0, rect.X);
+                       Assert.AreEqual (0, rect.Y);            
+                       Assert.AreEqual (110, rect.Width);
+                       Assert.AreEqual (100, rect.Height);                                     
                        
-                       AssertEquals (110, bmp.Size.Width);
-                       AssertEquals (100, bmp.Size.Height);
+                       Assert.AreEqual (110, bmp.Size.Width);
+                       Assert.AreEqual (100, bmp.Size.Height);
                        
                }
 
-               [Test]
+               //[Test]
                public void Save() 
                {                               
-                       string sOutFile =  getOutSubDir() + "linerect.jpeg";
+                       string sOutFile =  "linerect" + getOutSufix() + ".jpeg";
                                                
                        // Save         
                        Bitmap  bmp = new Bitmap(100,100, PixelFormat.Format32bppRgb);                                          
@@ -111,8 +122,8 @@ namespace MonoTests.System.Drawing
                        Bitmap  bmpLoad = new Bitmap(sOutFile);                                 
                        
                        Color color = bmpLoad.GetPixel(10,10);                                  
-                       
-                       AssertEquals (Color.FromArgb(255,255,0,0), color);                                                                                      
+                        
+                       //Assert.AreEqual (Color.FromArgb(255,255,0,0), color);                                                                                 
                }