Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from xUnit to NUnit #79

Merged
merged 38 commits into from
May 11, 2017
Merged

Migrate from xUnit to NUnit #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
efaeff3
Test: move to nunit - test
leasunhy Apr 28, 2017
20bf628
Test: remove test project
leasunhy Apr 28, 2017
a916a55
Test: add simple xunit-to-nunit converting scripts
leasunhy Apr 28, 2017
10dcb98
Test: update root packages.config for nunit
leasunhy Apr 28, 2017
1458726
Test: updated template for nunit; project files for coreclr not updated
leasunhy Apr 28, 2017
32fe9a5
Test: update convert_to_unit script
leasunhy Apr 28, 2017
f4d7af5
Test: convert existing test projects to nunit projects
leasunhy Apr 28, 2017
d4a4425
Test: update convert script to handle Assert.Equal
leasunhy Apr 28, 2017
1c2213a
Test: update test.csproj to run nunit tests; test_coreclr.csproj not …
leasunhy Apr 28, 2017
12cd1ef
Test: fix Assert.Equal and Assert.InRange
leasunhy Apr 28, 2017
f0f7574
Test: update .gitignore to ignore nunit reports
leasunhy Apr 28, 2017
ceb3e51
Test: fix tsl1
leasunhy Apr 28, 2017
7eec74c
Test: replace Assert.True with Assert.That
leasunhy Apr 28, 2017
303d796
Test: update msbuild script to make nunit spawn only one worker
leasunhy Apr 28, 2017
eecb1cd
Test: coreclr support for NUnit wip
leasunhy May 1, 2017
dfa2910
Test: fix the permission mode for tests/convert_to_nunit.sh
leasunhy May 1, 2017
ccc2f72
Test: NUnit test runner init
leasunhy May 1, 2017
7ba6571
Test: update coreclr csproj template and accordingly update existing …
leasunhy May 1, 2017
56d9255
Test: fix nunit test runner
leasunhy May 1, 2017
bdaf801
Test: update test_coreclr.csproj to make use of nunit_test_runner
leasunhy May 1, 2017
69f815f
Test: meta runner wip
leasunhy May 2, 2017
052a24c
Test: meta runner milestone - process isolation done
leasunhy May 2, 2017
a5f417a
Test: meta runner - add argument `result-dir`
leasunhy May 2, 2017
4e28745
Test: update test_coreclr.csproj
leasunhy May 2, 2017
9668787
Test: refine test_coreclr.csproj - tests failing to build will not be…
leasunhy May 2, 2017
7887fee
Test: coreclr tests are run with a time limit of 30mins
leasunhy May 2, 2017
30c14fb
Test: omit timeout for now
leasunhy May 8, 2017
10a7080
Test: use new syntax for command line args for the meta runner
leasunhy May 8, 2017
d6f094d
Test: add timeout support in meta runner
leasunhy May 8, 2017
c3cbffe
Test: add timeout support in test_coreclr.csproj
leasunhy May 8, 2017
4253a30
Test: the meta runner now use the same random seed for all tests
leasunhy May 8, 2017
336aaad
Test: add naive result aggregator
leasunhy May 10, 2017
808cea5
Test: add naive result xml synthesizer for tests that exited abnormally
leasunhy May 10, 2017
879a28b
Test: fix bugs in meta runner
leasunhy May 10, 2017
2725cf5
Test: update test_coreclr.csproj
leasunhy May 10, 2017
e01de4b
Test: fix bug in the meta runner
leasunhy May 10, 2017
f5d8acb
Test: fix start-time, end-time and duration for tests that exited abn…
leasunhy May 11, 2017
133bf14
Test: meta runner - fix the issue of file name and add messages for t…
leasunhy May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,6 @@ tools/dotnet/*
tools/dotnet-dev-win-x64.latest.exe
tests/xunit_reports
tests/xunit_coreclr_reports
tests/nunit_reports
tests/nunit_coreclr_reports
tests/new_test.exe
4 changes: 2 additions & 2 deletions tests/cleanup/cleanup1/cleanup1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Xunit;
using NUnit.Framework;
using Trinity;
using Trinity.Storage;

namespace cleanup1
{
public class cleanup1
{
[Fact]
[Test]
public void T1()
{
TrinityServer server = new TrinityServer();
Expand Down
19 changes: 3 additions & 16 deletions tests/cleanup/cleanup1/cleanup1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\GraphEngine.Core.1.0.8850\build\GraphEngine.Core.props" Condition="Exists('..\..\packages\GraphEngine.Core.1.0.8850\build\GraphEngine.Core.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
Expand Down Expand Up @@ -48,21 +48,8 @@
<HintPath>..\..\packages\GraphEngine.Core.1.0.8850\lib\Trinity.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions tests/cleanup/cleanup1/cleanup1_coreclr.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
<PackageReference Include="nunit" Version="3.6.1" />
<PackageReference Include="GraphEngine.CoreCLR" version="1.0.8850"/>
</ItemGroup>

Expand Down
11 changes: 3 additions & 8 deletions tests/cleanup/cleanup1/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GraphEngine.Core" version="1.0.8850" targetFramework="net452" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
<package id="xunit" version="2.2.0" targetFramework="net452" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
<package id="xunit.core" version="2.2.0" targetFramework="net452" />
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
</packages>
<package id="NUnit" version="3.6.1" targetFramework="net461" />
</packages>
4 changes: 2 additions & 2 deletions tests/cleanup/cleanup2/cleanup2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Xunit;
using NUnit.Framework;
using Trinity;
using Trinity.Storage;

namespace cleanup2
{
public class cleanup2
{
[Fact]
[Test]
public void StartServerTwice()
{
TrinityServer server = new TrinityServer();
Expand Down
19 changes: 3 additions & 16 deletions tests/cleanup/cleanup2/cleanup2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\GraphEngine.Core.1.0.8850\build\GraphEngine.Core.props" Condition="Exists('..\..\packages\GraphEngine.Core.1.0.8850\build\GraphEngine.Core.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
Expand Down Expand Up @@ -48,21 +48,8 @@
<HintPath>..\..\packages\GraphEngine.Core.1.0.8850\lib\Trinity.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions tests/cleanup/cleanup2/cleanup2_coreclr.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
<PackageReference Include="nunit" Version="3.6.1" />
<PackageReference Include="GraphEngine.CoreCLR" version="1.0.8850"/>
</ItemGroup>

Expand Down
11 changes: 3 additions & 8 deletions tests/cleanup/cleanup2/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GraphEngine.Core" version="1.0.8850" targetFramework="net452" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
<package id="xunit" version="2.2.0" targetFramework="net452" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
<package id="xunit.core" version="2.2.0" targetFramework="net452" />
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
</packages>
<package id="NUnit" version="3.6.1" targetFramework="net461" />
</packages>
4 changes: 2 additions & 2 deletions tests/cleanup/cleanup3/cleanup3.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Xunit;
using NUnit.Framework;
using Trinity;
using Trinity.Storage;

namespace cleanup3
{
public class cleanup3
{
[Fact]
[Test]
public void T1()
{
Global.LocalStorage.ResetStorage();
Expand Down
19 changes: 3 additions & 16 deletions tests/cleanup/cleanup3/cleanup3.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\GraphEngine.Core.1.0.8850\build\GraphEngine.Core.props" Condition="Exists('..\..\packages\GraphEngine.Core.1.0.8850\build\GraphEngine.Core.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
Expand Down Expand Up @@ -48,21 +48,8 @@
<HintPath>..\..\packages\GraphEngine.Core.1.0.8850\lib\Trinity.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions tests/cleanup/cleanup3/cleanup3_coreclr.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
<PackageReference Include="nunit" Version="3.6.1" />
<PackageReference Include="GraphEngine.CoreCLR" version="1.0.8850"/>
</ItemGroup>

Expand Down
11 changes: 3 additions & 8 deletions tests/cleanup/cleanup3/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GraphEngine.Core" version="1.0.8850" targetFramework="net452" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
<package id="xunit" version="2.2.0" targetFramework="net452" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
<package id="xunit.core" version="2.2.0" targetFramework="net452" />
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
</packages>
<package id="NUnit" version="3.6.1" targetFramework="net461" />
</packages>
4 changes: 2 additions & 2 deletions tests/cleanup/cleanup4/cleanup4.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Xunit;
using NUnit.Framework;
using Trinity;
using Trinity.Storage;

namespace cleanup4
{
public class cleanup4
{
[Fact]
[Test]
public void AllocateLocalStorageTwice()
{
Global.LocalStorage.ResetStorage();
Expand Down
19 changes: 3 additions & 16 deletions tests/cleanup/cleanup4/cleanup4.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\GraphEngine.Core.1.0.8850\build\GraphEngine.Core.props" Condition="Exists('..\..\packages\GraphEngine.Core.1.0.8850\build\GraphEngine.Core.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
Expand Down Expand Up @@ -48,21 +48,8 @@
<HintPath>..\..\packages\GraphEngine.Core.1.0.8850\lib\Trinity.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions tests/cleanup/cleanup4/cleanup4_coreclr.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
<PackageReference Include="nunit" Version="3.6.1" />
<PackageReference Include="GraphEngine.CoreCLR" version="1.0.8850"/>
</ItemGroup>

Expand Down
11 changes: 3 additions & 8 deletions tests/cleanup/cleanup4/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GraphEngine.Core" version="1.0.8850" targetFramework="net452" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
<package id="xunit" version="2.2.0" targetFramework="net452" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
<package id="xunit.core" version="2.2.0" targetFramework="net452" />
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
</packages>
<package id="NUnit" version="3.6.1" targetFramework="net461" />
</packages>
9 changes: 4 additions & 5 deletions tests/cleanup/cleanup5/cleanup5.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Xunit;
using NUnit.Framework;
using Trinity;
using Trinity.Storage;

namespace cleanup5
{
public class cleanup5
{
[Theory]
[InlineData(10)]
[InlineData(50)]
[InlineData(100)]
[TestCase(10)]
[TestCase(50)]
[TestCase(100)]
public void InitUninitStressTest(int count)
{
for (int i=0; i<count; ++i)
Expand Down
19 changes: 3 additions & 16 deletions tests/cleanup/cleanup5/cleanup5.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\GraphEngine.Core.1.0.8850\build\GraphEngine.Core.props" Condition="Exists('..\..\packages\GraphEngine.Core.1.0.8850\build\GraphEngine.Core.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
Expand Down Expand Up @@ -48,21 +48,8 @@
<HintPath>..\..\packages\GraphEngine.Core.1.0.8850\lib\Trinity.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
<Reference Include="nunit.framework, Version=3.6.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions tests/cleanup/cleanup5/cleanup5_coreclr.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta1-build3642" />
<PackageReference Include="nunit" Version="3.6.1" />
<PackageReference Include="GraphEngine.CoreCLR" version="1.0.8850"/>
</ItemGroup>

Expand Down
11 changes: 3 additions & 8 deletions tests/cleanup/cleanup5/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GraphEngine.Core" version="1.0.8850" targetFramework="net452" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
<package id="xunit" version="2.2.0" targetFramework="net452" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
<package id="xunit.core" version="2.2.0" targetFramework="net452" />
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
</packages>
<package id="NUnit" version="3.6.1" targetFramework="net461" />
</packages>
Loading