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

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);