Move tests into a shared folder (#121)

mono · Jun 28, 2022 · fe4c7bc · fe4c7bc
1 parent b4b9752
commit fe4c7bc
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 4 deletions.
diff --git a/tests/SkiaSharp.Extended.UI.Forms.Tests/SkiaSharp.Extended.UI.Forms.Tests.csproj b/tests/SkiaSharp.Extended.UI.Forms.Tests/SkiaSharp.Extended.UI.Forms.Tests.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <DefineConstants>$(DefineConstants);XAMARIN_FORMS</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,6 +18,26 @@
     <ProjectReference Include="..\..\source\SkiaSharp.Extended.UI.Forms\SkiaSharp.Extended.UI.Forms.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Using Include="System" />
+    <Using Include="System.Collections.Generic" />
+    <Using Include="System.IO" />
+    <Using Include="System.Net.Http" />
+    <Using Include="System.Threading" />
+    <Using Include="System.Threading.Tasks" />
+    <Using Include="Xamarin.Forms" />
+    <Using Include="Xamarin.Forms.Internals" />
+    <Using Include="Xamarin.Forms.Xaml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\SkiaSharp.Extended.UI.Tests\**\*.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="..\SkiaSharp.Extended.UI.Tests\TestAssets\**" Link="TestAssets\%(RecursiveDir)%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Remove="TestResults\**\*" />
   </ItemGroup>

diff --git a/tests/SkiaSharp.Extended.UI.Forms.WPF.Tests/SkiaSharp.Extended.UI.Forms.WPF.Tests.csproj b/tests/SkiaSharp.Extended.UI.Forms.WPF.Tests/SkiaSharp.Extended.UI.Forms.WPF.Tests.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWpf>true</UseWpf>
+    <DefineConstants>$(DefineConstants);XAMARIN_FORMS</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...nfettiColorCollectionTypeConverterTest.cs → ...nfettiColorCollectionTypeConverterTest.cs b/...nfettiColorCollectionTypeConverterTest.cs → ...nfettiColorCollectionTypeConverterTest.cs
@@ -1,7 +1,10 @@
 using SkiaSharp.Extended.UI.Controls.Converters;
-using Xamarin.Forms;
 using Xunit;
 
+#if XAMARIN_FORMS
+using Colors = Xamarin.Forms.Color;
+#endif
+
 namespace SkiaSharp.Extended.UI.Controls.Tests
 {
 	public class SKConfettiColorCollectionTypeConverterTest
@@ -22,7 +25,7 @@ public void CanParseSingleColor(string value)
 
 			Assert.NotNull(collection);
 			var color = Assert.Single(collection);
-			Assert.Equal(Color.Red, color);
+			Assert.Equal(Colors.Red, color);
 		}
 
 		[Theory]
@@ -40,7 +43,7 @@ public void CanParseMultipleColors(string value)
 			var collection = Assert.IsType<SKConfettiColorCollection>(result);
 
 			Assert.NotNull(collection);
-			Assert.Equal(new[] { Color.Red, Color.Red, Color.Blue }, collection);
+			Assert.Equal(new[] { Colors.Red, Colors.Red, Colors.Blue }, collection);
 		}
 	}
 }
diff --git a/...ConfettiEmitterBoundsTypeConverterTest.cs → ...ConfettiEmitterBoundsTypeConverterTest.cs b/...ConfettiEmitterBoundsTypeConverterTest.cs → ...ConfettiEmitterBoundsTypeConverterTest.cs
@@ -1,6 +1,5 @@
 using System;
 using SkiaSharp.Extended.UI.Controls.Converters;
-using Xamarin.Forms;
 using Xunit;
 
 namespace SkiaSharp.Extended.UI.Controls.Tests

diff --git a/...ontrols/Confetti/SKConfettiEmitterTest.cs → ...ontrols/Confetti/SKConfettiEmitterTest.cs b/...ontrols/Confetti/SKConfettiEmitterTest.cs → ...ontrols/Confetti/SKConfettiEmitterTest.cs
diff --git a/...ontrols/Confetti/SKConfettiPhysicsTest.cs → ...ontrols/Confetti/SKConfettiPhysicsTest.cs b/...ontrols/Confetti/SKConfettiPhysicsTest.cs → ...ontrols/Confetti/SKConfettiPhysicsTest.cs
diff --git a/...tti/SKConfettiPhysicsTypeConverterTest.cs → ...tti/SKConfettiPhysicsTypeConverterTest.cs b/...tti/SKConfettiPhysicsTypeConverterTest.cs → ...tti/SKConfettiPhysicsTypeConverterTest.cs
diff --git a/.../Controls/Confetti/SKConfettiShapeTest.cs → .../Controls/Confetti/SKConfettiShapeTest.cs b/.../Controls/Confetti/SKConfettiShapeTest.cs → .../Controls/Confetti/SKConfettiShapeTest.cs
diff --git a/...Controls/Confetti/SKConfettiSystemTest.cs → ...Controls/Confetti/SKConfettiSystemTest.cs b/...Controls/Confetti/SKConfettiSystemTest.cs → ...Controls/Confetti/SKConfettiSystemTest.cs