mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 3.10.0

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/System.Drawing/Test/System.Drawing.Design/UITypeEditorCas.cs
View File

@ -78,7 +78,6 @@ namespace MonoCasTests.System.Drawing.Design {
unit.DefaultValues ();
}
#if !TARGET_JVM
[Test]
[PermissionSet (SecurityAction.Deny, Unrestricted = true)]
public void UnitTests_PaintValue ()
@ -87,7 +86,6 @@ namespace MonoCasTests.System.Drawing.Design {
unit.PaintValue_PaintValueEventArgs ();
unit.PaintValue ();
}
#endif
// we use reflection to call UITypeEditor class as it's protected by a
// LinkDemand (which will be converted into full demand, i.e. a stack

2
mcs/class/System.Drawing/Test/System.Drawing.Design/UITypeEditorTest.cs
View File

@ -65,7 +65,6 @@ namespace MonoTests.System.Drawing.Design {
#endif
}
#if !TARGET_JVM
[Test]
public void PaintValue_PaintValueEventArgs_Null ()
{
@ -83,6 +82,5 @@ namespace MonoTests.System.Drawing.Design {
{
editor.PaintValue (null, graphics, Rectangle.Empty);
}
#endif
}
}

3
mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestColorBlend.cs
View File

@ -97,9 +97,6 @@ namespace MonoTests.System.Drawing.Drawing2D
[Test]
[ExpectedException (typeof (OverflowException))]
#if TARGET_JVM
[Category ("NotWorking")] // defect 6364
#endif
public void ColorBlend_Negative ()
{
ColorBlend cb = new ColorBlend (-1);

3
mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestHatchBrush.cs
View File

@ -97,9 +97,6 @@ namespace MonoTests.System.Drawing.Drawing2D
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void TestDrawing ()
{
// create a bitmap with big enough dimensions

23
mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
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);

2
mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestColorMatrix.cs
View File

@ -160,10 +160,8 @@ namespace MonoTests.System.Drawing.Imaging {
Assert.AreEqual (0, cm.Matrix41, "4,1");
Assert.AreEqual (0, cm.Matrix42, "4,2");
Assert.AreEqual (0, cm.Matrix43, "4,3");
#if !TARGET_JVM
Assert.AreEqual (100, Marshal.SizeOf (cm), "object");
Assert.AreEqual (100, Marshal.SizeOf (typeof (ColorMatrix)), "type");
#endif
}
[Test]

78
mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageAttributes.cs
View File

@ -71,9 +71,6 @@ namespace MonoTests.System.Drawing.Imaging {
// Text Color Matrix processing
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void ColorMatrix1 ()
{
Color clr_src, clr_rslt;
@ -93,9 +90,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void ColorMatrix2 ()
{
Color clr_src, clr_rslt;
@ -152,18 +146,12 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void ColorMatrix_80323_UsingAlpha ()
{
Bug80323 (Color.FromArgb (100, 255, 0, 0));
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void ColorMatrix_80323_WithoutAlpha ()
{
// this color is identical, once drawn over the bitmap, to Color.FromArgb (100, 255, 0, 0)
@ -186,9 +174,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_Null ()
{
@ -211,9 +196,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_Default_Any ()
{
@ -223,9 +205,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_Default_Count ()
{
@ -235,9 +214,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_AltGrays ()
{
@ -247,9 +223,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_AltGrays_Any ()
{
@ -259,9 +232,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_AltGrays_Bitmap ()
{
@ -271,9 +241,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_AltGrays_Brush ()
{
@ -283,9 +250,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_AltGrays_Count ()
{
@ -295,9 +259,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_AltGrays_Default ()
{
@ -307,9 +268,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_AltGrays_Pen ()
{
@ -319,9 +277,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_AltGrays_Text ()
{
@ -344,9 +299,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_SkipGrays_Any ()
{
@ -356,9 +308,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_SkipGrays_Count ()
{
@ -368,9 +317,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_InvalidFlag ()
{
@ -380,9 +326,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrix_InvalidType()
{
@ -392,9 +335,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrices_Null_ColorMatrix ()
{
@ -414,9 +354,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrices_ColorMatrix_Null_AltGrays ()
{
@ -437,9 +374,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
public void SetColorMatrices_Gray ()
{
Color c = ProcessColorMatrices (Color.Gray, global_color_matrix, global_gray_matrix, ColorMatrixFlag.Default, ColorAdjustType.Default);
@ -453,9 +387,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
public void SetColorMatrices_Color ()
{
Color c = ProcessColorMatrices (Color.MidnightBlue, global_color_matrix, global_gray_matrix, ColorMatrixFlag.Default, ColorAdjustType.Default);
@ -469,9 +400,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrices_InvalidFlags ()
{
@ -481,9 +409,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
[ExpectedException (typeof (ArgumentException))]
public void SetColorMatrices_InvalidType ()
{
@ -524,9 +449,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("ImageAttributes is not supported in GH")]
#endif
public void ColorMatrixAlpha ()
{
for (int i = 0; i < 256; i++) {

39
mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageCodecInfo.cs
View File

@ -122,9 +122,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Decoders ()
{
Assert.AreEqual (8, decoders.Count, "Count");
@ -148,9 +145,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Encoders ()
{
Assert.AreEqual (5, encoders.Count, "Count");
@ -171,9 +165,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void BMPCodec()
{
Guid g = new Guid ("557cf400-1a04-11d3-9a73-0000f81ef32e");
@ -184,9 +175,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void GifCodec()
{
Guid g = new Guid ("557cf402-1a04-11d3-9a73-0000f81ef32e");
@ -197,9 +185,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void JpegCodec()
{
Guid g = new Guid ("557cf401-1a04-11d3-9a73-0000f81ef32e");
@ -210,9 +195,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void PngCodec()
{
Guid g = new Guid ("557cf406-1a04-11d3-9a73-0000f81ef32e");
@ -223,9 +205,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void TiffCodec ()
{
Guid g = new Guid ("557cf405-1a04-11d3-9a73-0000f81ef32e");
@ -236,9 +215,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void IconCodec_Encoder ()
{
Guid g = new Guid ("557cf407-1a04-11d3-9a73-0000f81ef32e");
@ -246,9 +222,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void IconCodec_Decoder ()
{
Guid g = new Guid ("557cf407-1a04-11d3-9a73-0000f81ef32e");
@ -259,9 +232,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void EmfCodec_Encoder ()
{
Guid g = new Guid ("557cf403-1a04-11d3-9a73-0000f81ef32e");
@ -269,9 +239,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void EmfCodec_Decoder ()
{
Guid g = new Guid ("557cf403-1a04-11d3-9a73-0000f81ef32e");
@ -283,9 +250,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void WmfCodec_Encoder ()
{
Guid g = new Guid ("557cf404-1a04-11d3-9a73-0000f81ef32e");
@ -293,9 +257,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void WmfCodec_Decoder ()
{
Guid g = new Guid ("557cf404-1a04-11d3-9a73-0000f81ef32e");

25
mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs
View File

@ -72,9 +72,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Ignore ("#8853")]
#endif
public void Bitmap8bbpIndexedGreyscaleFeatures ()
{
string sInFile = getInFile ("bitmaps/nature-greyscale.jpg");
@ -116,9 +113,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Bitmap8bbpIndexedGreyscalePixels ()
{
string sInFile = getInFile ("bitmaps/nature-greyscale.jpg");
@ -150,7 +144,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
}
#if !TARGET_JVM
[Test]
public void Bitmap8bbpIndexedGreyscaleData ()
{
@ -212,13 +205,9 @@ namespace MonoTests.System.Drawing.Imaging {
}
}
}
#endif
/* Checks bitmap features on a known 24-bits bitmap */
[Test]
#if TARGET_JVM
[Category("NotWorking")]
#endif
public void Bitmap24bitFeatures ()
{
string sInFile = getInFile ("bitmaps/nature24bits.jpg");
@ -283,7 +272,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
}
#if !TARGET_JVM
[Test]
public void Bitmap24bitData ()
{
@ -408,7 +396,6 @@ namespace MonoTests.System.Drawing.Imaging {
}
}
}
#endif
private void Save (PixelFormat original, PixelFormat expected)
{
@ -449,36 +436,24 @@ namespace MonoTests.System.Drawing.Imaging {
}
[Test]
#if TARGET_JVM
[Category("NotWorking")]
#endif
public void Save_24bppRgb ()
{
Save (PixelFormat.Format24bppRgb, PixelFormat.Format24bppRgb);
}
[Test]
#if TARGET_JVM
[Category("NotWorking")]
#endif
public void Save_32bppRgb ()
{
Save (PixelFormat.Format32bppRgb, PixelFormat.Format24bppRgb);
}
[Test]
#if TARGET_JVM
[Category("NotWorking")]
#endif
public void Save_32bppArgb ()
{
Save (PixelFormat.Format32bppArgb, PixelFormat.Format24bppRgb);
}
[Test]
#if TARGET_JVM
[Category("NotWorking")]
#endif
public void Save_32bppPArgb ()
{
Save (PixelFormat.Format32bppPArgb, PixelFormat.Format24bppRgb);

15
mcs/class/System.Drawing/Test/System.Drawing/ColorConverter.cs
View File

@ -59,9 +59,6 @@ namespace MonoTests.System.Drawing {
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void CanConvertFrom () {
Assert.IsTrue (colconv.CanConvertFrom (typeof (String)), "CCF#1");
Assert.IsTrue (colconv.CanConvertFrom (null, typeof (String)), "CCF#1a");
@ -92,9 +89,6 @@ namespace MonoTests.System.Drawing {
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ConvertFrom ()
{
Color color = (Color) colconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@ -196,9 +190,6 @@ namespace MonoTests.System.Drawing {
[Test]
[ExpectedException (typeof (Exception))]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ConvertFrom_x4 ()
{
colconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@ -367,9 +358,6 @@ namespace MonoTests.System.Drawing {
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ConvertFromInvariantString_InvalidNumber ()
{
try {
@ -399,9 +387,6 @@ namespace MonoTests.System.Drawing {
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ConvertFromString_InvalidNumber ()
{
try {

6
mcs/class/System.Drawing/Test/System.Drawing/ColorTranslator.cs
View File

@ -83,9 +83,6 @@ namespace MonoTests.System.Drawing {
[Test]
[ExpectedException (typeof (Exception))]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void FromHtml_PoundNegative ()
{
ColorTranslator.FromHtml ("#-1");
@ -100,9 +97,6 @@ namespace MonoTests.System.Drawing {
[Test]
[ExpectedException (typeof (Exception))]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void FromHtml_Unknown ()
{
ColorTranslator.FromHtml ("unknown-color-test");

40
mcs/class/System.Drawing/Test/System.Drawing/TestBitmap.cs
View File

@ -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
}
}

3
mcs/class/System.Drawing/Test/System.Drawing/TestBrushes.cs
View File

@ -49,9 +49,6 @@ namespace MonoTests.System.Drawing {
[Test]
[ExpectedException (typeof (ArgumentException))]
#if TARGET_JVM
[Ignore ("Throws ArgumentException - Implementation specific")]
#endif
public void Dispose ()
{
Brushes.YellowGreen.Dispose ();

11
mcs/class/System.Drawing/Test/System.Drawing/TestColor.cs
View File

@ -1181,9 +1181,6 @@ namespace MonoTests.System.Drawing {
0x01, 0x00, 0x0B };
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Deserialize ()
{
BinaryFormatter bf = new BinaryFormatter ();
@ -1201,9 +1198,6 @@ namespace MonoTests.System.Drawing {
67,111,108,111,114,5,115,116,97,116,101,1,0,0,0,9,7,7,2,0,0,0,10,0,0,0,0,0,0,0,0,37,0,1,0,11 };
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Deserialize2 ()
{
BinaryFormatter bf = new BinaryFormatter ();
@ -1229,9 +1223,6 @@ namespace MonoTests.System.Drawing {
67,111,108,111,114,5,115,116,97,116,101,1,0,0,0,9,7,7,2,0,0,0,10,255,0,0,255,0,0,0,0,0,0,2,0,11};
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Deserialize3 ()
{
BinaryFormatter bf = new BinaryFormatter ();
@ -1285,7 +1276,6 @@ namespace MonoTests.System.Drawing {
}
}
#if !TARGET_JVM
private void Compare (KnownColor kc, GetSysColorIndex index)
{
// we get BGR than needs to be converted into ARGB
@ -1335,7 +1325,6 @@ namespace MonoTests.System.Drawing {
Compare (KnownColor.MenuHighlight, GetSysColorIndex.COLOR_MENUHIGHLIGHT);
#endif
}
#endif // TARGET_JVM
}
}

59
mcs/class/System.Drawing/Test/System.Drawing/TestFont.cs
View File

@ -118,7 +118,6 @@ namespace MonoTests.System.Drawing{
public string lfFaceName;
}
#if !TARGET_JVM
[Test]
[Category ("CAS")]
[ExpectedException (typeof (SecurityException))]
@ -199,13 +198,9 @@ namespace MonoTests.System.Drawing{
Font f = new Font ("Arial", 10);
f.ToLogFont (null);
}
#endif
[Test]
#if ONLY_1_1
[ExpectedException (typeof (ArgumentNullException))]
#endif
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_StringNull_Float ()
{
@ -219,9 +214,6 @@ namespace MonoTests.System.Drawing{
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_String_Float ()
{
Font f = new Font (name, 12.5f);
@ -240,9 +232,6 @@ namespace MonoTests.System.Drawing{
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_String_Float_FontStyle ()
{
Font f = new Font (name, 12.5f, FontStyle.Bold);
@ -261,9 +250,6 @@ namespace MonoTests.System.Drawing{
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_String_Float_FontStyle_GraphicsUnit ()
{
Font f = new Font (name, 12.5f, FontStyle.Italic, GraphicsUnit.Pixel);
@ -282,18 +268,12 @@ namespace MonoTests.System.Drawing{
[Test]
[ExpectedException (typeof (ArgumentException))]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_String_Float_FontStyle_GraphicsUnit_Display ()
{
new Font (name, 12.5f, FontStyle.Italic, GraphicsUnit.Display);
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_String_Float_FontStyle_GraphicsUnit_Byte ()
{
Font f = new Font (name, 12.5f, FontStyle.Strikeout, GraphicsUnit.Inch, Byte.MaxValue);
@ -312,9 +292,6 @@ namespace MonoTests.System.Drawing{
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_String_Float_FontStyle_GraphicsUnit_Byte_Bool ()
{
Font f = new Font (name, 12.5f, FontStyle.Underline, GraphicsUnit.Document, Byte.MinValue, true);
@ -349,9 +326,6 @@ namespace MonoTests.System.Drawing{
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_FontFamily_Float ()
{
Font f = new Font (FontFamily.GenericMonospace, 12.5f);
@ -370,9 +344,6 @@ namespace MonoTests.System.Drawing{
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_FontFamily_Float_FontStyle ()
{
Font f = new Font (FontFamily.GenericMonospace, 12.5f, FontStyle.Bold);
@ -391,9 +362,6 @@ namespace MonoTests.System.Drawing{
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_FontFamily_Float_FontStyle_GraphicsUnit ()
{
Font f = new Font (FontFamily.GenericMonospace, 12.5f, FontStyle.Italic, GraphicsUnit.Millimeter);
@ -413,18 +381,12 @@ namespace MonoTests.System.Drawing{
[Test]
[ExpectedException (typeof (ArgumentException))]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_FontFamily_Float_FontStyle_GraphicsUnit_Display ()
{
new Font (FontFamily.GenericMonospace, 12.5f, FontStyle.Italic, GraphicsUnit.Display);
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_FontFamily_Float_FontStyle_GraphicsUnit_Byte ()
{
Font f = new Font (FontFamily.GenericMonospace, 12.5f, FontStyle.Strikeout, GraphicsUnit.Inch, Byte.MaxValue);
@ -443,9 +405,6 @@ namespace MonoTests.System.Drawing{
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Font_FontFamily_Float_FontStyle_GraphicsUnit_Byte_Bool ()
{
Font f = new Font (FontFamily.GenericMonospace, 12.5f, FontStyle.Underline, GraphicsUnit.Document, Byte.MinValue, true);
@ -484,9 +443,6 @@ namespace MonoTests.System.Drawing{
[Test]
[ExpectedException (typeof (ArgumentException))]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Dispose_Height ()
{
Font f = new Font (name, 12.5f);
@ -496,26 +452,17 @@ namespace MonoTests.System.Drawing{
[Test]
[ExpectedException (typeof (ArgumentException))]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Dispose_ToLogFont ()
{
#if !TARGET_JVM
Font f = new Font (name, 12.5f);
f.Dispose ();
LOGFONT lf = new LOGFONT();
f.ToLogFont (lf);
#endif
}
[Test]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Dispose_ToLogFont_LoopCharSet ()
{
#if !TARGET_JVM
Font f = new Font (name, 12.5f);
f.Dispose ();
LOGFONT lf = new LOGFONT ();
@ -560,21 +507,15 @@ namespace MonoTests.System.Drawing{
Assert.Fail ("Unexcepted exception {0} at iteration {1}", e, i);
}
}
#endif
}
[Test]
[ExpectedException (typeof (ArgumentException))]
#if TARGET_JVM
[Category ("NotWorking")]
#endif
public void Dispose_ToHFont ()
{
#if !TARGET_JVM
Font f = new Font (name, 12.5f);
f.Dispose ();
f.ToHfont ();
#endif
}
[Test]

79
mcs/class/System.Drawing/Test/System.Drawing/TestIcon.cs
View File

@ -94,18 +94,12 @@ namespace MonoTests.System.Drawing {
[Test]
[ExpectedException (typeof (ArgumentException))]
#if TARGET_JVM
[Ignore ("Check parameters")]
#endif
public void Constructor_IconNull_Int_Int ()
{
new Icon ((Icon)null, 32, 32);
}
[Test]
#if TARGET_JVM
[Ignore ("Constructor_Icon_IntNegative_Int Not Working")]
#endif
public void Constructor_Icon_IntNegative_Int ()
{
Icon neg = new Icon (icon, -32, 32);
@ -115,18 +109,12 @@ namespace MonoTests.System.Drawing {
[Test]
[ExpectedException (typeof (ArgumentException))]
#if TARGET_JVM
[Ignore ("Check parameters")]
#endif
public void Constructor_IconNull_Size ()
{
new Icon ((Icon) null, new Size (32, 32));
}
[Test]
#if TARGET_JVM
[Ignore ("Constructor_Icon_Size_Negative Not Working")]
#endif
public void Constructor_Icon_Size_Negative ()
{
Icon neg = new Icon (icon, new Size (-32, -32));
@ -135,9 +123,6 @@ namespace MonoTests.System.Drawing {
}
[Test]
#if TARGET_JVM
[Ignore ("Constructor_Icon_Int_Int_NonSquare Not Working")]
#endif
public void Constructor_Icon_Int_Int_NonSquare ()
{
Icon non_square = new Icon (icon, 32, 16);
@ -217,9 +202,6 @@ namespace MonoTests.System.Drawing {
[Test]
[ExpectedException (typeof (ArgumentException))]
#if TARGET_JVM
[Ignore ("Check parameters")]
#endif
public void Constructor_Type_StringNull ()
{
new Icon (typeof (Icon), null);
@ -227,38 +209,23 @@ namespace MonoTests.System.Drawing {
#if NET_2_0
[Test]
[ExpectedException (typeof (ArgumentException))]
#if TARGET_JVM
[Ignore ("Constructor_StreamNull_Size Not Implemented")]
#endif
public void Constructor_StreamNull_Size ()
{
#if !TARGET_JVM
new Icon ((Stream) null, new Size (32, 32));
#endif
}
[Test]
[ExpectedException (typeof (ArgumentNullException))]
#if TARGET_JVM
[Ignore ("Constructor_StringNull_Size Not Implemented")]
#endif
public void Constructor_StringNull_Size ()
{
#if !TARGET_JVM
new Icon ((string) null, new Size (32, 32));
#endif
}
[Test]
[ExpectedException (typeof (ArgumentNullException))]
#if TARGET_JVM
[Ignore ("Constructor_StringNull_Int_Int Not Implemented")]
#endif
public void Constructor_StringNull_Int_Int ()
{
#if !TARGET_JVM
new Icon ((string) null, 32, 32);
#endif
}
#endif
@ -281,7 +248,6 @@ namespace MonoTests.System.Drawing {
Assert.AreEqual (32, clone.Size.Height, "Size.Height");
}
#if !TARGET_JVM
[Test]
public void CloneHandleIcon ()
{
@ -291,7 +257,6 @@ namespace MonoTests.System.Drawing {
Assert.AreEqual (SystemIcons.Hand.Size.Width, clone.Size.Width, "Size.Width");
Assert.AreEqual (SystemIcons.Hand.Size.Height, clone.Size.Height, "Size.Height");
}
#endif
private void XPIcon (int size)
{
@ -331,9 +296,6 @@ namespace MonoTests.System.Drawing {
}
[Test]
#if TARGET_JVM
[Ignore ("SelectFromUnusualSize_Small16 Not Working")]
#endif
public void SelectFromUnusualSize_Small16 ()
{
using (FileStream fs = File.OpenRead (TestBitmap.getInFile ("bitmaps/80509.ico"))) {
@ -421,18 +383,12 @@ namespace MonoTests.System.Drawing {
[Test]
[ExpectedException (typeof (NullReferenceException))]
#if TARGET_JVM
[Ignore ("Throws NullReference, do we need to follow?")]
#endif
public void Save_Null ()
{
icon.Save (null);
}
[Test]
#if TARGET_JVM
[Ignore ("Icon16ToBitmap Not Working")]
#endif
public void Icon16ToBitmap ()
{
using (Bitmap b = icon16.ToBitmap ()) {
@ -447,9 +403,6 @@ namespace MonoTests.System.Drawing {
}
[Test]
#if TARGET_JVM
[Ignore ("Icon32ToBitmap Not Working")]
#endif
public void Icon32ToBitmap ()
{
using (Bitmap b = icon32.ToBitmap ()) {
@ -464,9 +417,6 @@ namespace MonoTests.System.Drawing {
}
[Test]
#if TARGET_JVM
[Ignore ("Icon48ToBitmap Not Working")]
#endif
public void Icon48ToBitmap ()
{
using (Bitmap b = icon48.ToBitmap ()) {
@ -481,9 +431,6 @@ namespace MonoTests.System.Drawing {
}
[Test]
#if TARGET_JVM
[Ignore ("Icon64ToBitmap Not Working")]
#endif
public void Icon64ToBitmap ()
{
using (Bitmap b = icon64.ToBitmap ()) {
@ -498,9 +445,6 @@ namespace MonoTests.System.Drawing {
}
[Test]
#if TARGET_JVM
[Ignore ("Icon96ToBitmap Not Working")]
#endif
public void Icon96ToBitmap ()
{
using (Bitmap b = icon96.ToBitmap ()) {
@ -515,9 +459,6 @@ namespace MonoTests.System.Drawing {
}
[Test] // bug #415581
#if TARGET_JVM
[Ignore ("Icon256ToBitmap Not Working")]
#endif
public void Icon256ToBitmap ()
{
using (FileStream fs = File.OpenRead (TestBitmap.getInFile ("bitmaps/415581.ico"))) {
@ -572,38 +513,23 @@ namespace MonoTests.System.Drawing {
#if NET_2_0
[Test]
[ExpectedException (typeof (ArgumentException))]
#if TARGET_JVM
[Ignore ("ExtractAssociatedIcon is not implemented")]
#endif
public void ExtractAssociatedIcon_Null ()
{
#if !TARGET_JVM
Icon.ExtractAssociatedIcon (null);
#endif
}
[Test]
[ExpectedException (typeof (ArgumentException))]
#if TARGET_JVM
[Ignore ("ExtractAssociatedIcon is not implemented")]
#endif
public void ExtractAssociatedIcon_Empty ()
{
#if !TARGET_JVM
Icon.ExtractAssociatedIcon (String.Empty);
#endif
}
[Test]
[ExpectedException (typeof (FileNotFoundException))]
#if TARGET_JVM
[Ignore ("ExtractAssociatedIcon is not implemented")]
#endif
public void ExtractAssociatedIcon_DoesNotExists ()
{
#if !TARGET_JVM
Icon.ExtractAssociatedIcon ("does-not-exists.png");
#endif
}
#endif
@ -617,11 +543,7 @@ namespace MonoTests.System.Drawing {
}
[TestFixture]
#if TARGET_JVM
[Ignore ("Unsafe code is not supported")]
#endif
public class IconFullTrustTest {
#if !TARGET_JVM
#if NET_2_0
[Test]
public void ExtractAssociatedIcon ()
@ -721,6 +643,5 @@ namespace MonoTests.System.Drawing {
IconTest.SaveAndCompare ("HICON", icon3, false);
}
}
#endif
}
}

12
mcs/class/System.Drawing/Test/System.Drawing/TestIconConverter.cs
View File

@ -81,9 +81,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestCanConvertFrom ()
{
Assert.IsTrue (icoConv.CanConvertFrom (typeof (byte [])), "CCF#1");
@ -115,9 +112,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestCanConvertTo ()
{
Assert.IsTrue (icoConv.CanConvertTo (typeof (String)), "CCT#1");
@ -151,9 +145,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestConvertFrom ()
{
Icon newIcon = (Icon) icoConv.ConvertFrom (null, CultureInfo.InvariantCulture, iconBytes);
@ -264,9 +255,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestConvertTo ()
{
Assert.AreEqual (iconStr, (String) icoConv.ConvertTo (null,

102
mcs/class/System.Drawing/Test/System.Drawing/TestImageConverter.cs
View File

@ -77,9 +77,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestCanConvertFrom ()
{
Assert.IsTrue (imgConv.CanConvertFrom (typeof (byte [])), "CCF#1");
@ -111,9 +108,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestCanConvertTo ()
{
Assert.IsTrue (imgConv.CanConvertTo (typeof (String)), "CCT#1");
@ -147,9 +141,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ConvertFrom ()
{
Image newImage = (Image) imgConv.ConvertFrom (null, CultureInfo.InvariantCulture, imageBytes);
@ -166,9 +157,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertFrom_BadString ()
{
@ -176,9 +164,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertFrom_BadString_WithCulture ()
{
@ -186,9 +171,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertFrom_Bitmap ()
{
@ -196,9 +178,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertFrom_Point ()
{
@ -206,9 +185,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertFrom_SizeF ()
{
@ -216,9 +192,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertFrom_Object ()
{
@ -226,9 +199,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertFrom_BadString ()
{
@ -236,9 +206,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertFrom_BadString_Culture ()
{
@ -246,9 +213,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertFrom_Bitmap ()
{
@ -256,9 +220,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertFrom_Point ()
{
@ -266,9 +227,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertFrom_SizeF ()
{
@ -276,9 +234,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertFrom_Object ()
{
@ -286,9 +241,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ConvertTo ()
{
Assert.AreEqual (imageStr, (String) imgConv.ConvertTo (null, CultureInfo.InvariantCulture,
@ -326,9 +278,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertTo_Rectangle ()
{
@ -336,9 +285,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertTo_Image ()
{
@ -346,9 +292,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertTo_Size ()
{
@ -356,9 +299,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertTo_Bitmap ()
{
@ -366,9 +306,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertTo_Point ()
{
@ -376,9 +313,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertTo_Metafile ()
{
@ -386,9 +320,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertTo_Object ()
{
@ -396,9 +327,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void ConvertTo_Int ()
{
@ -406,9 +334,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertTo_Rectangle ()
{
@ -416,9 +341,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertTo_Image ()
{
@ -426,9 +348,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertTo_Size ()
{
@ -436,9 +355,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertTo_Bitmap ()
{
@ -446,9 +362,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertTo_Point ()
{
@ -456,9 +369,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertTo_Metafile ()
{
@ -466,9 +376,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertTo_Object ()
{
@ -476,9 +383,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
[ExpectedException (typeof (NotSupportedException))]
public void TypeDescriptor_ConvertTo_Int ()
{
@ -486,9 +390,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestGetPropertiesSupported ()
{
Assert.IsTrue (imgConv.GetPropertiesSupported (), "GPS#1");
@ -496,9 +397,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestGetProperties ()
{
#if NET_2_0

18
mcs/class/System.Drawing/Test/System.Drawing/TestPointConverter.cs
View File

@ -63,9 +63,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestCanConvertFrom ()
{
Assert.IsTrue (ptconv.CanConvertFrom (typeof (String)), "CCF#1");
@ -97,9 +94,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestConvertFrom ()
{
Assert.AreEqual (pt, (Point) ptconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@ -280,9 +274,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestGetProperties ()
{
Attribute [] attrs;
@ -325,9 +316,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ConvertFromInvariantString_string_exc_2 ()
{
try {
@ -341,9 +329,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ConvertFromString_string ()
{
// save current culture
@ -367,9 +352,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ConvertFromString_string_exc_2 ()
{
try {

18
mcs/class/System.Drawing/Test/System.Drawing/TestRectangleConverter.cs
View File

@ -69,9 +69,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestCanConvertFrom ()
{
Assert.IsTrue (rconv.CanConvertFrom (typeof (String)), "CCF#1");
@ -103,9 +100,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestConvertFrom ()
{
Assert.AreEqual (rect, (Rectangle) rconv.ConvertFrom (null, CultureInfo.InvariantCulture,
@ -334,9 +328,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void TestGetProperties ()
{
Attribute [] attrs;
@ -394,9 +385,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ConvertFromInvariantString_string_exc_2 ()
{
try {
@ -410,9 +398,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ConvertFromString_string ()
{
// save current culture
@ -438,9 +423,6 @@ namespace MonoTests.System.Drawing
}
[Test]
#if TARGET_JVM
[NUnit.Framework.Category ("NotWorking")]
#endif
public void ConvertFromString_string_exc_2 ()
{
try {

Some files were not shown because too many files have changed in this diff Show More