[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.
This commit is contained in:
Vsevolod Kukol 2015-02-13 10:19:43 +01:00
Родитель 5d6f2956d1
Коммит 305518fee9
9 изменённых файлов: 139 добавлений и 3 удалений

Просмотреть файл

@ -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>

Просмотреть файл

@ -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 ();
}
}
}

Просмотреть файл

@ -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);

Просмотреть файл

@ -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" />

Просмотреть файл

@ -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 ();
}
}
}

Просмотреть файл

@ -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);

Просмотреть файл

@ -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">

Просмотреть файл

@ -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);

Просмотреть файл

@ -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 ();
}
}
}