Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
This commit is contained in:
Jo Shields
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions

View File

@ -75,9 +75,6 @@ namespace MonoTests.System.Drawing.Imaging {
/* Checks bitmap features on a know 1bbp bitmap */
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Bitmap1bitFeatures ()
{
string sInFile = getInFile ("bitmaps/almogaver1bit.bmp");
@ -154,9 +151,6 @@ namespace MonoTests.System.Drawing.Imaging {
/* Checks bitmap features on a know 8bbp bitmap */
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Bitmap8bitFeatures ()
{
string sInFile = getInFile ("bitmaps/almogaver8bits.bmp");
@ -232,9 +226,6 @@ namespace MonoTests.System.Drawing.Imaging {
/* Checks bitmap features on a know 24-bits bitmap */
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[Test]
public void Bitmap24bitFeatures()
{
@ -308,7 +299,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
}
#if !TARGET_JVM
[Test]
public void Bitmap24bitData ()
{
@ -434,7 +424,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
}
}
#endif
/* Checks bitmap features on a know 32-bits bitmap (codec)*/
[Test]
@ -548,36 +537,24 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category("NotWorking")]
#endif
public void Save_24bppRgb ()
{
Save (PixelFormat.Format24bppRgb, PixelFormat.Format24bppRgb, true);
}
[Test]
#if TARGET_JVM
[Category("NotWorking")]
#endif
public void Save_32bppRgb ()
{
Save (PixelFormat.Format32bppRgb, PixelFormat.Format32bppRgb, true);
}
[Test]
#if TARGET_JVM
[Category("NotWorking")]
#endif
public void Save_32bppArgb ()
{
Save (PixelFormat.Format32bppArgb, PixelFormat.Format32bppRgb, true);
}
[Test]
#if TARGET_JVM
[Category("NotWorking")]
#endif
public void Save_32bppPArgb ()
{
Save (PixelFormat.Format32bppPArgb, PixelFormat.Format32bppRgb, true);