Merge remote-tracking branch 'origin/master' into merge-xammac

15 files changed, 171 insertions, 24 deletions

diff --git a/Testing/GtkTestRunner.csproj b/Testing/GtkTestRunner.csproj
index c9434051..ed8ef7b9 100644
--- a/Testing/GtkTestRunner.csproj
+++ b/Testing/GtkTestRunner.csproj
@@ -30,22 +30,22 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="nunit.core">
-      <HintPath>libs\nunit.core.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath>
     </Reference>
     <Reference Include="nunit.core.interfaces">
-      <HintPath>libs\nunit.core.interfaces.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-      <HintPath>libs\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="nunit-console-runner">
-      <HintPath>libs\nunit-console-runner.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit-console-runner.dll</HintPath>
     </Reference>
     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="nunit.util">
-      <HintPath>libs\nunit.util.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.util.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
@@ -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>
@@ -148,4 +149,7 @@
       <LogicalName>ninep-tt.9@2x.png</LogicalName>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Testing/GtkTestRunner/GtkInit.cs b/Testing/GtkTestRunner/GtkInit.cs
new file mode 100644
index 00000000..186ab86a
--- /dev/null
+++ b/Testing/GtkTestRunner/GtkInit.cs
@@ -0,0 +1,47 @@
+//
+// 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);
+			ReferenceImageManager.Init ("GtkTestRunner");
+		}
+
+		[TearDown]
+		public void Exit ()
+		{
+			Application.Dispose ();
+		}
+	}
+}
+
diff --git a/Testing/GtkTestRunner/Main.cs b/Testing/GtkTestRunner/Main.cs
index d17a48d0..6dc4b09c 100644
--- a/Testing/GtkTestRunner/Main.cs
+++ b/Testing/GtkTestRunner/Main.cs
@@ -35,9 +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);
 			list.Add ("-domain=None");
 			list.Add ("-noshadow");
diff --git a/Testing/MacTestRunner.csproj b/Testing/MacTestRunner.csproj
index d45371f0..a5c366b3 100644
--- a/Testing/MacTestRunner.csproj
+++ b/Testing/MacTestRunner.csproj
@@ -52,19 +52,19 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
     <Reference Include="nunit.core">
-      <HintPath>libs\nunit.core.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath>
     </Reference>
     <Reference Include="nunit.core.interfaces">
-      <HintPath>libs\nunit.core.interfaces.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
-      <HintPath>libs\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="nunit.util">
-      <HintPath>libs\nunit.util.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.util.dll</HintPath>
     </Reference>
     <Reference Include="nunit-console-runner">
-      <HintPath>libs\nunit-console-runner.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit-console-runner.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Mac">
       <HintPath>\Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\i386\full\Xamarin.Mac.dll</HintPath>
@@ -76,10 +76,12 @@
     <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" />
     <None Include="Info.plist" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />
diff --git a/Testing/MacTestRunner/MacInit.cs b/Testing/MacTestRunner/MacInit.cs
new file mode 100644
index 00000000..a809c701
--- /dev/null
+++ b/Testing/MacTestRunner/MacInit.cs
@@ -0,0 +1,46 @@
+//
+// 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);
+			ReferenceImageManager.Init ("MacTestRunner");
+		}
+
+		[TearDown]
+		public void Exit ()
+		{
+			Application.Dispose ();
+		}
+	}
+}
diff --git a/Testing/MacTestRunner/Main.cs b/Testing/MacTestRunner/Main.cs
index f7fbdf03..5553e793 100644
--- a/Testing/MacTestRunner/Main.cs
+++ b/Testing/MacTestRunner/Main.cs
@@ -10,9 +10,6 @@ namespace MacTest
 			//FIXME: remove this once mmp summorts xammac
 			ObjCRuntime.Dlfcn.dlopen ("/Library/Frameworks/Xamarin.Mac.framework/Versions/Current/lib/libxammac.dylib", 0);
 
-			Application.Initialize (ToolkitType.Cocoa);
-			ReferenceImageManager.Init ("MacTestRunner");
-
 			var list = new List<string> (args);
 			list.Add ("-domain=None");
 			list.Add ("-noshadow");
diff --git a/Testing/WpfTestRunner.csproj b/Testing/WpfTestRunner.csproj
index 191dfd74..f61a2df7 100644
--- a/Testing/WpfTestRunner.csproj
+++ b/Testing/WpfTestRunner.csproj
@@ -33,16 +33,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit-console-runner">
-      <HintPath>libs\nunit-console-runner.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit-console-runner.dll</HintPath>
     </Reference>
     <Reference Include="nunit.core">
-      <HintPath>libs\nunit.core.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.dll</HintPath>
     </Reference>
     <Reference Include="nunit.core.interfaces">
-      <HintPath>libs\nunit.core.interfaces.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.core.interfaces.dll</HintPath>
     </Reference>
     <Reference Include="nunit.util">
-      <HintPath>libs\nunit.util.dll</HintPath>
+      <HintPath>..\packages\NUnit.Runners.2.6.4\tools\lib\nunit.util.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -52,7 +52,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
     <Reference Include="nunit.framework">
-      <HintPath>libs\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -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">
@@ -155,4 +156,7 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Testing/WpfTestRunner/Program.cs b/Testing/WpfTestRunner/Program.cs
index 32a71f66..9128e2dc 100644
--- a/Testing/WpfTestRunner/Program.cs
+++ b/Testing/WpfTestRunner/Program.cs
@@ -11,9 +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);
 			list.Add ("-domain=None");
 			list.Add ("-noshadow");
diff --git a/Testing/WpfTestRunner/WpfInit.cs b/Testing/WpfTestRunner/WpfInit.cs
new file mode 100644
index 00000000..88d20476
--- /dev/null
+++ b/Testing/WpfTestRunner/WpfInit.cs
@@ -0,0 +1,48 @@
+//
+// 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;
+
+[assembly:RequiresSTA]
+
+namespace Xwt
+{
+	[SetUpFixture]
+	public class WpfInit
+	{
+		[SetUp]
+		public void Init ()
+		{
+			Application.Initialize (Xwt.ToolkitType.Wpf);
+			ReferenceImageManager.Init ("WpfTestRunner");
+		}
+
+		[TearDown]
+		public void Exit ()
+		{
+			Application.Dispose ();
+		}
+	}
+}
diff --git a/Testing/libs/nunit-console-runner.dll b/Testing/libs/nunit-console-runner.dll
deleted file mode 100755
index b0e611af..00000000
--- a/Testing/libs/nunit-console-runner.dll
+++ /dev/null
diff --git a/Testing/libs/nunit.core.dll b/Testing/libs/nunit.core.dll
deleted file mode 100755
index 5f748bec..00000000
--- a/Testing/libs/nunit.core.dll
+++ /dev/null
diff --git a/Testing/libs/nunit.core.interfaces.dll b/Testing/libs/nunit.core.interfaces.dll
deleted file mode 100755
index 72b9486d..00000000
--- a/Testing/libs/nunit.core.interfaces.dll
+++ /dev/null
diff --git a/Testing/libs/nunit.framework.dll b/Testing/libs/nunit.framework.dll
deleted file mode 100755
index eaea9eed..00000000
--- a/Testing/libs/nunit.framework.dll
+++ /dev/null
diff --git a/Testing/libs/nunit.util.dll b/Testing/libs/nunit.util.dll
deleted file mode 100755
index 28d603c6..00000000
--- a/Testing/libs/nunit.util.dll
+++ /dev/null
diff --git a/Testing/packages.config b/Testing/packages.config
new file mode 100644
index 00000000..e463457b
--- /dev/null
+++ b/Testing/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>

+<packages>

+  <package id="NUnit" version="2.6.4" targetFramework="net40" />

+  <package id="NUnit.Runners" version="2.6.4" />

+</packages>
\ No newline at end of file