Added brush tests to cairo render tests.

VisualBrush tests currently ignored as it's not yet implemented on
cairo.

src/Gtk/Perspex.Cairo/CairoExtensions.cs

@@ -7,6 +7,11 @@ namespace Perspex.Cairo
 
     public static class CairoExtensions
     {
+        public static Cairo.Color ToCairo(this Perspex.Media.Color color)
+        {
+            return new Cairo.Color(color.R / 255.0, color.G / 255.0, color.B / 255.0, color.A / 255.0);
+        }
+
         public static Cairo.Matrix ToCairo(this Matrix m)
         {
             return new Cairo.Matrix(m.M11, m.M12, m.M21, m.M22, m.M31, m.M32);

src/Gtk/Perspex.Cairo/Media/DrawingContext.cs

@@ -227,10 +227,14 @@ namespace Perspex.Cairo.Media
             }
             else if (linearGradientBrush != null)
             {
-                Cairo.LinearGradient g = new Cairo.LinearGradient(linearGradientBrush.StartPoint.X * destinationSize.Width, linearGradientBrush.StartPoint.Y * destinationSize.Height, linearGradientBrush.EndPoint.X * destinationSize.Width, linearGradientBrush.EndPoint.Y * destinationSize.Height);
+                Cairo.LinearGradient g = new Cairo.LinearGradient(
+                    linearGradientBrush.StartPoint.X * destinationSize.Width, 
+                    linearGradientBrush.StartPoint.Y * destinationSize.Height, 
+                    linearGradientBrush.EndPoint.X * destinationSize.Width, 
+                    linearGradientBrush.EndPoint.Y * destinationSize.Height);
 
                 foreach (var s in linearGradientBrush.GradientStops)
-                    g.AddColorStop(s.Offset, new Cairo.Color(s.Color.R / 255.0, s.Color.G / 255.0, s.Color.B / 255.0, s.Color.A / 255.0));
+                    g.AddColorStop(s.Offset, s.Color.ToCairo());
 
                 g.Extend = Cairo.Extend.Pad;
 

tests/Perspex.RenderTests/Media/LinearGradientBrushTests.cs

@@ -10,7 +10,11 @@ using System.Text;
 using System.Threading.Tasks;
 using Xunit;
 
+#if PERSPEX_CAIRO
+namespace Perspex.Cairo.RenderTests.Media
+#else
 namespace Perspex.Direct2D1.RenderTests.Media
+#endif
 {
     public class LinearGradientBrushTests : TestBase
     {

tests/Perspex.RenderTests/Media/VisualBrushTests.cs

@@ -7,7 +7,11 @@ using Perspex.Layout;
 using Perspex.Media;
 using Xunit;
 
+#if PERSPEX_CAIRO
+namespace Perspex.Cairo.RenderTests.Media
+#else
 namespace Perspex.Direct2D1.RenderTests.Media
+#endif
 {
     public class VisualBrushTests : TestBase
     {
@@ -16,7 +20,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
         {
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_Align_TopLeft()
         {
             Decorator target = new Decorator
@@ -55,7 +63,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_Align_Center()
         {
             Decorator target = new Decorator
@@ -94,7 +106,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_Align_BottomRight()
         {
             Decorator target = new Decorator
@@ -133,7 +149,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_Stretch_Fill_Large()
         {
             Decorator target = new Decorator
@@ -170,7 +190,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_Stretch_Uniform()
         {
             Decorator target = new Decorator
@@ -207,7 +231,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_Stretch_UniformToFill()
         {
             Decorator target = new Decorator
@@ -244,7 +272,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_SourceRect_Absolute()
         {
             Decorator target = new Decorator
@@ -281,7 +313,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_DestinationRect_Absolute()
         {
             Decorator target = new Decorator
@@ -318,7 +354,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_SourceRect_DestinationRect_Absolute()
         {
             Decorator target = new Decorator
@@ -356,7 +396,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_SourceRect_DestinationRect_Percent()
         {
             Decorator target = new Decorator
@@ -394,7 +438,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_Tile()
         {
             Decorator target = new Decorator
@@ -433,7 +481,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_Tile_Alignment_BottomRight()
         {
             Decorator target = new Decorator
@@ -473,7 +525,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_FlipX()
         {
             Decorator target = new Decorator
@@ -512,7 +568,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_FlipY()
         {
             Decorator target = new Decorator
@@ -551,7 +611,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "VisualBrush not yet implemented on Cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_FlipXY()
         {
             Decorator target = new Decorator

tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj

@@ -74,6 +74,8 @@
   <ItemGroup>
     <Compile Include="Controls\ImageTests.cs" />
     <Compile Include="Controls\BorderTests.cs" />
+    <Compile Include="Media\LinearGradientBrushTests.cs" />
+    <Compile Include="Media\VisualBrushTests.cs" />
     <Compile Include="Shapes\PathTests.cs" />
     <Compile Include="Shapes\EllipseTests.cs" />
     <Compile Include="Shapes\RectangleTests.cs" />