Reorganized unit test suite

We now have a test assembly for each platform, and code is shared
in the different projects.

2 files changed, 8 insertions, 230 deletions

diff --git a/Testing/MacTestRunner/MacTestRunner.csproj b/Testing/MacTestRunner/MacTestRunner.csproj
deleted file mode 100644
index a2fd0925..00000000
--- a/Testing/MacTestRunner/MacTestRunner.csproj
+++ /dev/null
@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0017C823-67F6-4DFA-8C2C-E23CD1E33D8F}</ProjectGuid>
-    <ProjectTypeGuids>{948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>MacTestRunner</RootNamespace>
-    <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
-    <AssemblyName>MacTestRunner</AssemblyName>
-    <SuppressXamMacMigration>True</SuppressXamMacMigration>
-    <SuppressXamMacUpsell>True</SuppressXamMacUpsell>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <IncludeMonoRuntime>False</IncludeMonoRuntime>
-    <UseSGen>False</UseSGen>
-    <EnablePackageSigning>False</EnablePackageSigning>
-    <ConsolePause>False</ConsolePause>
-    <EnableCodeSigning>False</EnableCodeSigning>
-    <CreatePackage>False</CreatePackage>
-    <CodeSigningKey>Mac Developer</CodeSigningKey>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <IncludeMonoRuntime>True</IncludeMonoRuntime>
-    <UseSGen>False</UseSGen>
-    <LinkMode>Full</LinkMode>
-    <EnablePackageSigning>False</EnablePackageSigning>
-    <ConsolePause>False</ConsolePause>
-    <EnableCodeSigning>True</EnableCodeSigning>
-    <CreatePackage>True</CreatePackage>
-    <CodeSigningKey>Developer ID Application</CodeSigningKey>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\AppStore</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <IncludeMonoRuntime>True</IncludeMonoRuntime>
-    <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
-    <LinkMode>Full</LinkMode>
-    <UseSGen>False</UseSGen>
-    <EnableCodeSigning>True</EnableCodeSigning>
-    <ConsolePause>False</ConsolePause>
-    <EnablePackageSigning>True</EnablePackageSigning>
-    <CreatePackage>True</CreatePackage>
-    <CodeSigningKey>3rd Party Mac Developer Application</CodeSigningKey>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="MonoMac" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Main.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Info.plist" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\..\Xwt\Xwt.csproj">
-      <Project>{92494904-35FA-4DC9-BDE9-3A3E87AC49D3}</Project>
-      <Name>Xwt</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Xwt.Mac\Xwt.Mac.csproj">
-      <Project>{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}</Project>
-      <Name>Xwt.Mac</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Tests\Tests.csproj">
-      <Project>{8C624AB7-8195-4AE5-98CE-5F8676821AF7}</Project>
-      <Name>Tests</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties>
-        <Policies>
-          <DotNetNamingPolicy DirectoryNamespaceAssociation="None" ResourceNamePolicy="FileName" />
-        </Policies>
-      </Properties>
-    </MonoDevelop>
-  </ProjectExtensions>
-  <ItemGroup>
-    <EmbeddedResource Include="ReferenceImages\Arc.png">
-      <LogicalName>Arc.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcFill.png">
-      <LogicalName>ArcFill.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcMultipleLoops.png">
-      <LogicalName>ArcMultipleLoops.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcNegative.png">
-      <LogicalName>ArcNegative.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcNegativeFill.png">
-      <LogicalName>ArcNegativeFill.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcNegativeMultipleLoops.png">
-      <LogicalName>ArcNegativeMultipleLoops.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcNegativeStartingNegative.png">
-      <LogicalName>ArcNegativeStartingNegative.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcNegativeSwappedAngles.png">
-      <LogicalName>ArcNegativeSwappedAngles.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcStartingNegative.png">
-      <LogicalName>ArcStartingNegative.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcSwappedAngles.png">
-      <LogicalName>ArcSwappedAngles.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\NewPath.png">
-      <LogicalName>NewPath.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\Rectangle.png">
-      <LogicalName>Rectangle.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\StrokePreserve.png">
-      <LogicalName>StrokePreserve.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcNegativePathConnection.png">
-      <LogicalName>ArcNegativePathConnection.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcPathConnection.png">
-      <LogicalName>ArcPathConnection.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\LinearGradient.png">
-      <LogicalName>LinearGradient.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\LinearGradientDiagonal.png">
-      <LogicalName>LinearGradientDiagonal.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\LinearGradientInternalBox.png">
-      <LogicalName>LinearGradientInternalBox.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\LinearGradientReverse.png">
-      <LogicalName>LinearGradientReverse.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\RadialGradient.png">
-      <LogicalName>RadialGradient.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\RadialGradientReverse.png">
-      <LogicalName>RadialGradientReverse.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\RadialGradientSmall.png">
-      <LogicalName>RadialGradientSmall.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ImagePatternInCircle.png">
-      <LogicalName>ImagePatternInCircle.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ImagePatternInTriangle.png">
-      <LogicalName>ImagePatternInTriangle.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\Curve.png">
-      <LogicalName>Curve.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\CurvePathConnection.png">
-      <LogicalName>CurvePathConnection.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ImagePatternWithRotateTransform.png">
-      <LogicalName>ImagePatternWithRotateTransform.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ImagePatternWithScaleTransform.png">
-      <LogicalName>ImagePatternWithScaleTransform.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\RectanglePathConnection.png">
-      <LogicalName>RectanglePathConnection.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcClosePath.png">
-      <LogicalName>ArcClosePath.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\ArcNegativeClosePath.png">
-      <LogicalName>ArcNegativeClosePath.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\CurveClosePath.png">
-      <LogicalName>CurveClosePath.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\CurveFillWithHoles.png">
-      <LogicalName>CurveFillWithHoles.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\DrawPathTwoTimes.png">
-      <LogicalName>DrawPathTwoTimes.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\LineClosePath.png">
-      <LogicalName>LineClosePath.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\Text.png">
-      <LogicalName>Text.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\TextLineBreak.png">
-      <LogicalName>TextLineBreak.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\TextSize.png">
-      <LogicalName>TextSize.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\TextWithBlankLines.png">
-      <LogicalName>TextWithBlankLines.png</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ReferenceImages\TextWordWrap.png">
-      <LogicalName>TextWordWrap.png</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Testing/MacTestRunner/Main.cs b/Testing/MacTestRunner/Main.cs
index afcc7d1b..f2be6bfb 100644
--- a/Testing/MacTestRunner/Main.cs
+++ b/Testing/MacTestRunner/Main.cs
@@ -1,6 +1,7 @@
 using System;
 using Xwt;
 using System.IO;
+using System.Collections.Generic;
 
 namespace MacTest
 {
@@ -9,12 +10,14 @@ namespace MacTest
 		static void Main (string [] args)
 		{
 			Xwt.Application.Initialize (Xwt.ToolkitType.Cocoa);
+			ReferenceImageManager.Init ("MacTestRunner");
 
-			var baseDir = Path.GetDirectoryName (System.Reflection.Assembly.GetEntryAssembly ().Location);
-			ReferenceImageManager.ProjectCustomReferenceImageDir = baseDir + "/../../../../../ReferenceImages";
-
-			ConsoleTestRunner t = new ConsoleTestRunner ();
-			t.Run (new string[0]);
+			var list = new List<string> (args);
+			list.Add ("-domain=None");
+			list.Add ("-noshadow");
+			list.Add ("-nothread");
+			NUnit.ConsoleRunner.Runner.Main (list.ToArray ());
+			ReferenceImageManager.ShowImageVerifier ();
 		}
 	}
 }