tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Skip tests blocked by SkiaSharp

pull/517/head
Nikita Tsukanov 11 years ago
parent
dfe9665be5
commit
961b58dbfd
9 changed files with 70 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      Perspex.sln
  2. BIN
      tests/Perspex.RenderTests/Controls/BorderTests.cs
  3. 10
      tests/Perspex.RenderTests/Media/ImageBrushTests.cs
  4. 4
      tests/Perspex.RenderTests/Media/LinearGradientBrushTests.cs
  5. 22
      tests/Perspex.RenderTests/Media/VisualBrushTests.cs
  6. 2
      tests/Perspex.RenderTests/Perspex.Skia.RenderTests.csproj
  7. 11
      tests/Perspex.RenderTests/Shapes/PathTests.cs
  8. 4
      tests/Perspex.RenderTests/Shapes/PolygonTests.cs
  9. 4
      tests/Perspex.RenderTests/Shapes/PolylineTests.cs

37
Perspex.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Base", "src\Perspex.Base\Perspex.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
EndProject
@ -147,6 +147,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Logging.Serilog", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.DesignerSupport", "src\Perspex.DesignerSupport\Perspex.DesignerSupport.csproj", "{799A7BB5-3C2C-48B6-85A7-406A12C420DA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Skia.RenderTests", "tests\Perspex.RenderTests\Perspex.Skia.RenderTests.csproj", "{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Shared\RenderHelpers\RenderHelpers.projitems*{fb05ac90-89ba-4f2f-a924-f37875fb547c}*SharedItemsImports = 4
@ -1738,6 +1740,38 @@ Global
{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|x86.ActiveCfg = Release|Any CPU
{799A7BB5-3C2C-48B6-85A7-406A12C420DA}.Release|x86.Build.0 = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Ad-Hoc|x86.Build.0 = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.AppStore|Any CPU.Build.0 = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.AppStore|iPhone.Build.0 = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.AppStore|x86.ActiveCfg = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.AppStore|x86.Build.0 = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Debug|iPhone.Build.0 = Debug|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Debug|x86.ActiveCfg = Debug|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Debug|x86.Build.0 = Debug|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Release|Any CPU.Build.0 = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Release|iPhone.ActiveCfg = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Release|iPhone.Build.0 = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Release|x86.ActiveCfg = Release|Any CPU
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -1783,5 +1817,6 @@ Global
{61BEC86C-F307-4295-B5B8-9428610D7D55} = {9B9E3891-2366-4253-A952-D08BCEB71098}
{88060192-33D5-4932-B0F9-8BD2763E857D} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
{410AC439-81A1-4EB5-B5E9-6A7FC6B77F4B} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
{D35A9F3D-8BB0-496E-BF72-444038A7DEBB} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
EndGlobalSection
EndGlobal

BIN
tests/Perspex.RenderTests/Controls/BorderTests.cs
View File

Binary file not shown.

10
tests/Perspex.RenderTests/Media/ImageBrushTests.cs
View File

@ -102,7 +102,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
RenderToFile(target);
CompareImages();
}
#if PERSPEX_SKIA
#if PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -129,7 +129,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
CompareImages();
}
#if PERSPEX_SKIA
#if PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -156,7 +156,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
CompareImages();
}
#if PERSPEX_SKIA
#if PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -207,7 +207,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
CompareImages();
}
#if PERSPEX_SKIA
#if PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -235,7 +235,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
CompareImages();
}
#if PERSPEX_SKIA
#if PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]

4
tests/Perspex.RenderTests/Media/LinearGradientBrushTests.cs
View File

@ -24,7 +24,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
{
}
#if PERSPEX_SKIA
#if PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -55,7 +55,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
CompareImages();
}
#if PERSPEX_SKIA
#if PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]

22
tests/Perspex.RenderTests/Media/VisualBrushTests.cs
View File

@ -87,7 +87,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
#if PERSPEX_CAIRO
[Fact(Skip = "Font scaling currently broken on cairo")]
#elif PERSPEX_SKIA
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -143,7 +143,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
#if PERSPEX_CAIRO
[Fact(Skip = "Font scaling currently broken on cairo")]
#elif PERSPEX_SKIA
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -172,7 +172,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
#if PERSPEX_CAIRO
[Fact(Skip = "Font scaling currently broken on cairo")]
#elif PERSPEX_SKIA
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -201,7 +201,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
#if PERSPEX_CAIRO
[Fact(Skip = "Font scaling currently broken on cairo")]
#elif PERSPEX_SKIA
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -254,7 +254,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
#if PERSPEX_CAIRO
[Fact(Skip = "Font scaling currently broken on cairo")]
#elif PERSPEX_SKIA
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -282,7 +282,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
CompareImages();
}
#if PERSPEX_SKIA
#if PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -311,11 +311,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
CompareImages();
}
#if PERSPEX_SKIA
[Fact(Skip = "FIXME")]
#else
[Fact]
#endif
public void VisualBrush_NoStretch_Tile_BottomRightQuarterSource_CenterQuarterDest()
{
Decorator target = new Decorator
@ -342,7 +338,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
#if PERSPEX_CAIRO
[Fact(Skip = "TileMode.FlipX not yet supported on cairo")]
#elif PERSPEX_SKIA
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -372,7 +368,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
#if PERSPEX_CAIRO
[Fact(Skip = "TileMode.FlipY not yet supported on cairo")]
#elif PERSPEX_SKIA
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]
@ -402,7 +398,7 @@ namespace Perspex.Direct2D1.RenderTests.Media
#if PERSPEX_CAIRO
[Fact(Skip = "Font scaling currently broken on cairo")]
#elif PERSPEX_SKIA
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]

2
tests/Perspex.RenderTests/Perspex.Skia.RenderTests.csproj
View File

@ -20,7 +20,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;PERSPEX_SKIA</DefineConstants>
<DefineConstants>TRACE;DEBUG;PERSPEX_SKIA;PERSPEX_SKIA_SKIP_FAIL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>

11
tests/Perspex.RenderTests/Shapes/PathTests.cs
View File

@ -45,8 +45,11 @@ namespace Perspex.Direct2D1.RenderTests.Shapes
RenderToFile(target);
CompareImages();
}
#if PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "Waiting for https://github.com/mono/SkiaSharp/pull/63")]
#else
[Fact]
#endif
public void Path_Tick_Scaled()
{
Decorator target = new Decorator
@ -69,7 +72,11 @@ namespace Perspex.Direct2D1.RenderTests.Shapes
CompareImages();
}
#if PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "Waiting for https://github.com/mono/SkiaSharp/pull/63")]
#else
[Fact]
#endif
public void Path_Tick_Scaled_Stroke_8px()
{
Decorator target = new Decorator
@ -122,7 +129,7 @@ namespace Perspex.Direct2D1.RenderTests.Shapes
#if PERSPEX_CAIRO
[Fact(Skip = "Path with StrokeDashCap, StrokeStartLineCap, StrokeEndLineCap rendering is not implemented in Cairo yet")]
#elif PERSPEX_SKIA
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "FIXME")]
#else
[Fact]

4
tests/Perspex.RenderTests/Shapes/PolygonTests.cs
View File

@ -23,6 +23,8 @@ namespace Perspex.Direct2D1.RenderTests.Shapes
#if PERSPEX_CAIRO
[Fact(Skip = "Caused by cairo bug")]
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "Waiting for https://github.com/mono/SkiaSharp/pull/63")]
#else
[Fact]
#endif
@ -49,6 +51,8 @@ namespace Perspex.Direct2D1.RenderTests.Shapes
#if PERSPEX_CAIRO
[Fact(Skip = "Caused by cairo bug")]
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "Waiting for https://github.com/mono/SkiaSharp/pull/63")]
#else
[Fact]
#endif

4
tests/Perspex.RenderTests/Shapes/PolylineTests.cs
View File

@ -23,6 +23,8 @@ namespace Perspex.Direct2D1.RenderTests.Shapes
#if PERSPEX_CAIRO
[Fact(Skip = "Caused by cairo bug")]
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "Waiting for https://github.com/mono/SkiaSharp/pull/63")]
#else
[Fact]
#endif
@ -51,6 +53,8 @@ namespace Perspex.Direct2D1.RenderTests.Shapes
#if PERSPEX_CAIRO
[Fact(Skip = "Caused by cairo bug")]
#elif PERSPEX_SKIA_SKIP_FAIL
[Fact(Skip = "Waiting for https://github.com/mono/SkiaSharp/pull/63")]
#else
[Fact]
#endif

Write Preview
Loading…
Cancel
Save