[TEST] Add nunit-console support

nunit-console does not call the applications main method.
Application.Initialize() should be called from a separate SetUpFixture
to ensure correct initialization.

9 files changed, 139 insertions, 3 deletions

diff --git a/Testing/GtkTestRunner.csproj b/Testing/GtkTestRunner.csproj
index c9434051..814c3887 100644
--- a/Testing/GtkTestRunner.csproj
+++ b/Testing/GtkTestRunner.csproj
@@ -107,6 +107,7 @@
     <Compile Include="Tests\NinePatchTests.cs" />
     <Compile Include="Tests\DialogTests.cs" />
     <Compile Include="Tests\ScrollableWidgetTests.cs" />
+    <Compile Include="GtkTestRunner\GtkInit.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/Testing/GtkTestRunner/GtkInit.cs b/Testing/GtkTestRunner/GtkInit.cs
new file mode 100644
index 00000000..2e8dcb4c
--- /dev/null
+++ b/Testing/GtkTestRunner/GtkInit.cs
@@ -0,0 +1,46 @@
+//
+// GtkInit.cs
+//
+// Author:
+//       Vsevolod Kukol <sevo@sevo.org>
+//
+// Copyright (c) 2015 Vsevolod Kukol
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+                // THE SOFTWARE.
+using NUnit.Framework;
+
+namespace Xwt
+{
+	[SetUpFixture]
+	public class GtkInit
+	{
+		[SetUp]
+		public void Init ()
+		{
+			Application.Initialize (Xwt.ToolkitType.Gtk);
+		}
+
+		[TearDown]
+		public void Exit ()
+		{
+			Application.Dispose ();
+		}
+	}
+}
+
diff --git a/Testing/GtkTestRunner/Main.cs b/Testing/GtkTestRunner/Main.cs
index d17a48d0..807fa042 100644
--- a/Testing/GtkTestRunner/Main.cs
+++ b/Testing/GtkTestRunner/Main.cs
@@ -35,7 +35,6 @@ namespace GtkTestRunner
 	{
 		public static void Main (string[] args)
 		{
-			Xwt.Application.Initialize (Xwt.ToolkitType.Gtk);
 			ReferenceImageManager.Init ("GtkTestRunner");
 
 			var list = new List<string> (args);
diff --git a/Testing/MacTestRunner.csproj b/Testing/MacTestRunner.csproj
index 0b6600e8..c4281ac9 100644
--- a/Testing/MacTestRunner.csproj
+++ b/Testing/MacTestRunner.csproj
@@ -89,6 +89,7 @@
     <Compile Include="Tests\DrawingTestsBase.cs" />
     <Compile Include="Tests\NinePatchTests.cs" />
     <Compile Include="Tests\ScrollableWidgetTests.cs" />
+    <Compile Include="MacTestRunner\MacInit.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="MacTestRunner\Info.plist" />
diff --git a/Testing/MacTestRunner/MacInit.cs b/Testing/MacTestRunner/MacInit.cs
new file mode 100644
index 00000000..2a7c9b7a
--- /dev/null
+++ b/Testing/MacTestRunner/MacInit.cs
@@ -0,0 +1,45 @@
+//
+// MacInit.cs
+//
+// Author:
+//       Vsevolod Kukol <sevo@sevo.org>
+//
+// Copyright (c) 2015 Vsevolod Kukol
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+                // THE SOFTWARE.
+using NUnit.Framework;
+
+namespace Xwt
+{
+	[SetUpFixture]
+	public class MacInit
+	{
+		[SetUp]
+		public void Init ()
+		{
+			Application.Initialize (Xwt.ToolkitType.Cocoa);
+		}
+
+		[TearDown]
+		public void Exit ()
+		{
+			Application.Dispose ();
+		}
+	}
+}
diff --git a/Testing/MacTestRunner/Main.cs b/Testing/MacTestRunner/Main.cs
index 8292df20..6f95f6b7 100644
--- a/Testing/MacTestRunner/Main.cs
+++ b/Testing/MacTestRunner/Main.cs
@@ -10,7 +10,6 @@ namespace MacTest
 	{
 		static void Main (string [] args)
 		{
-			Xwt.Application.Initialize (Xwt.ToolkitType.Cocoa);
 			ReferenceImageManager.Init ("MacTestRunner");
 
 			var list = new List<string> (args);
diff --git a/Testing/WpfTestRunner.csproj b/Testing/WpfTestRunner.csproj
index 191dfd74..b34d0cbd 100644
--- a/Testing/WpfTestRunner.csproj
+++ b/Testing/WpfTestRunner.csproj
@@ -110,6 +110,7 @@
     <Compile Include="Tests\WidgetTests.cs" />
     <Compile Include="Tests\WindowTests.cs" />
     <Compile Include="Tests\XwtTest.cs" />
+    <Compile Include="WpfTestRunner\WpfInit.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xwt.WPF\Xwt.WPF.csproj">
diff --git a/Testing/WpfTestRunner/Program.cs b/Testing/WpfTestRunner/Program.cs
index 32a71f66..647ea46d 100644
--- a/Testing/WpfTestRunner/Program.cs
+++ b/Testing/WpfTestRunner/Program.cs
@@ -11,7 +11,6 @@ namespace WpfTestRunner
 		[STAThread]
 		static void Main (string[] args)
 		{
-			Xwt.Application.Initialize (Xwt.ToolkitType.Wpf);
 			ReferenceImageManager.Init ("WpfTestRunner");
 
 			var list = new List<string> (args);
diff --git a/Testing/WpfTestRunner/WpfInit.cs b/Testing/WpfTestRunner/WpfInit.cs
new file mode 100644
index 00000000..db2d593e
--- /dev/null
+++ b/Testing/WpfTestRunner/WpfInit.cs
@@ -0,0 +1,45 @@
+//
+// WpfInit.cs
+//
+// Author:
+//       Vsevolod Kukol <sevo@sevo.org>
+//
+// Copyright (c) 2015 Vsevolod Kukol
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using NUnit.Framework;
+
+namespace Xwt
+{
+	[SetUpFixture]
+	public class WpfInit
+	{
+		[SetUp]
+		public void Init ()
+		{
+			Application.Initialize (Xwt.ToolkitType.Wpf);
+		}
+
+		[TearDown]
+		public void Exit ()
+		{
+			Application.Dispose ();
+		}
+	}
+}