Skip to content

Commit

Permalink
Put back the tests, we were trying to track down the regressions
Browse files Browse the repository at this point in the history
  • Loading branch information
@migueldeicaza
migueldeicaza committed May 24, 2013
1 parent f918d5b commit c1c9dbb
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 19 deletions.
2 changes: 1 addition & 1 deletion external/cecil
Submodule cecil updated from fc76b9 to 54e0a5
4 changes: 0 additions & 4 deletions mcs/class/System.Drawing/Test/System.Drawing.Imaging/GifCodecTest.cs
View file
Expand Up @@ -270,28 +270,24 @@ private void Save (PixelFormat original, PixelFormat expected, bool exactColorCh
}

[Test]
[Category ("NotWorking")]
public void Save_24bppRgb ()
{
Save (PixelFormat.Format24bppRgb, PixelFormat.Format8bppIndexed, false);
}

[Test]
[Category ("NotWorking")]
public void Save_32bppRgb ()
{
Save (PixelFormat.Format32bppRgb, PixelFormat.Format8bppIndexed, false);
}

[Test]
[Category ("NotWorking")]
public void Save_32bppArgb ()
{
Save (PixelFormat.Format32bppArgb, PixelFormat.Format8bppIndexed, false);
}

[Test]
[Category ("NotWorking")]
public void Save_32bppPArgb ()
{
Save (PixelFormat.Format32bppPArgb, PixelFormat.Format8bppIndexed, false);
Expand Down
4 changes: 0 additions & 4 deletions mcs/class/System.Drawing/Test/System.Drawing.Imaging/IconCodecTest.cs
View file
Expand Up @@ -2002,28 +2002,24 @@ private void Save (PixelFormat original, PixelFormat expected, bool colorCheck)
}

[Test]
[Category ("NotWorking")]
public void Save_24bppRgb ()
{
Save (PixelFormat.Format24bppRgb, PixelFormat.Format24bppRgb, true);
}

[Test]
[Category ("NotWorking")]
public void Save_32bppRgb ()
{
Save (PixelFormat.Format32bppRgb, PixelFormat.Format32bppArgb, true);
}

[Test]
[Category ("NotWorking")]
public void Save_32bppArgb ()
{
Save (PixelFormat.Format32bppArgb, PixelFormat.Format32bppArgb, true);
}

[Test]
[Category ("NotWorking")]
public void Save_32bppPArgb ()
{
Save (PixelFormat.Format32bppPArgb, PixelFormat.Format32bppArgb, true);
Expand Down
4 changes: 0 additions & 4 deletions mcs/class/System.Drawing/Test/System.Drawing.Imaging/PngCodecTest.cs
View file
Expand Up @@ -674,28 +674,24 @@ private void Save (PixelFormat original, PixelFormat expected, bool colorCheck)
}

[Test]
[Category ("NotWorking")]
public void Save_24bppRgb ()
{
Save (PixelFormat.Format24bppRgb, PixelFormat.Format24bppRgb, true);
}

[Test]
[Category ("NotWorking")]
public void Save_32bppRgb ()
{
Save (PixelFormat.Format32bppRgb, PixelFormat.Format32bppArgb, true);
}

[Test]
[Category ("NotWorking")]
public void Save_32bppArgb ()
{
Save (PixelFormat.Format32bppArgb, PixelFormat.Format32bppArgb, true);
}

[Test]
[Category ("NotWorking")]
public void Save_32bppPArgb ()
{
Save (PixelFormat.Format32bppPArgb, PixelFormat.Format32bppArgb, true);
Expand Down
8 changes: 8 additions & 0 deletions mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestBmpCodec.cs
View file
Expand Up @@ -548,28 +548,36 @@ private void Save (PixelFormat original, PixelFormat expected, bool colorCheck)
}

[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);
Expand Down
8 changes: 8 additions & 0 deletions mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestJpegCodec.cs
View file
Expand Up @@ -449,28 +449,36 @@ private void Save (PixelFormat original, PixelFormat expected)
}

[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);
Expand Down
4 changes: 0 additions & 4 deletions mcs/class/System.Drawing/Test/System.Drawing.Imaging/TiffCodecTest.cs
View file
Expand Up @@ -314,28 +314,24 @@ private void Save (PixelFormat original, PixelFormat expected, bool colorCheck)
}

[Test]
[Category ("NotWorking")]
public void Save_24bppRgb ()
{
Save (PixelFormat.Format24bppRgb, PixelFormat.Format24bppRgb, true);
}

[Test]
[Category ("NotWorking")]
public void Save_32bppRgb ()
{
Save (PixelFormat.Format32bppRgb, PixelFormat.Format32bppArgb, true);
}

[Test]
[Category ("NotWorking")]
public void Save_32bppArgb ()
{
Save (PixelFormat.Format32bppArgb, PixelFormat.Format32bppArgb, true);
}

[Test]
[Category ("NotWorking")]
public void Save_32bppPArgb ()
{
Save (PixelFormat.Format32bppPArgb, PixelFormat.Format32bppArgb, true);
Expand Down
2 changes: 0 additions & 2 deletions mcs/class/System.Drawing/Test/System.Drawing/TestGraphics.cs
View file
Expand Up @@ -2082,7 +2082,6 @@ public void MeasureString_Bug76664 ()
}

[Test]
[Category ("NotWorking")]
public void MeasureString_Bug80680 ()
{
if (font == null)
Expand Down Expand Up @@ -2173,7 +2172,6 @@ public void MeasureCharacterRanges_FontNull ()
}

[Test] // adapted from bug #78777
[Category ("NotWorking")]
public void MeasureCharacterRanges_TwoLines ()
{
if (font == null)
Expand Down

0 comments on commit c1c9dbb

Please sign in to comment.