Skip to content

Commit

Permalink
Upgrade NUnit
Browse files Browse the repository at this point in the history
  • Loading branch information
hazzik committed Jun 11, 2019
1 parent 218add4 commit bc3f56b
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 17 deletions.
10 changes: 5 additions & 5 deletions Tools/packages.config
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit.Console" version="3.7.0" targetFramework="net461" />
<package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net461" />
<package id="NUnit.Console" version="3.10.0" targetFramework="net461" />
<package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net461" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net461" />
<package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net461" />
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
<package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.6" targetFramework="net461" />
<package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net461" />
<package id="CSharpAsyncGenerator.CommandLine" version="0.14.0" targetFramework="net461" />
<package id="vswhere" version="2.1.4" targetFramework="net461" />
<package id="gitreleasemanager" version="0.7.0" targetFramework="net461" />
<package id="GitReleaseManager" version="0.7.0" targetFramework="net461" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,13 @@
<None Include="..\NHibernate.Test\App.config" Link="App.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
<PackageReference Include="Microsoft.VisualBasic" Version="10.2.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<PackageReference Include="NUnitLite" Version="3.10.1" />
<PackageReference Include="NUnitLite" Version="3.12.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />
Expand Down
67 changes: 67 additions & 0 deletions src/NHibernate.Test/Async/NHSpecificTest/GH1963/Fixture.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by AsyncGenerator.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------


using System;
using System.Linq;
using NHibernate.UserTypes;
using NUnit.Framework;
using NHibernate.Linq;

namespace NHibernate.Test.NHSpecificTest.GH1963
{
using System.Threading.Tasks;
[TestFixture]
public class FixtureAsync : BugTestCase
{
protected override void OnSetUp()
{
using (var session = OpenSession())
using (var transaction = session.BeginTransaction())
{
var e1 = new Entity {Name = "Bob", Flag = true};
session.Save(e1);

var e2 = new Entity {Name = "Sally"};
session.Save(e2);

transaction.Commit();
}
}

protected override void OnTearDown()
{
using (var session = OpenSession())
using (var transaction = session.BeginTransaction())
{
session.CreateQuery("delete from System.Object").ExecuteUpdate();

transaction.Commit();
}
}

[Test]
public void LinqFilterOnNonLiteralCustomTypeAsync()
{
using (var session = OpenSession())
using (session.BeginTransaction())
{
var result = from e in session.Query<Entity>()
where e.Flag
select e;

Assert.That(
() => result.ToListAsync(),
Throws
.InnerException.TypeOf<InvalidOperationException>()
.And.InnerException.Message.Contains(nameof(IEnhancedUserType)));
}
}
}
}
7 changes: 1 addition & 6 deletions src/NHibernate.Test/NHSpecificTest/GH1963/Fixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ protected override void OnTearDown()
using (var session = OpenSession())
using (var transaction = session.BeginTransaction())
{
// The HQL delete does all the job inside the database without loading the entities, but it does
// not handle delete order for avoiding violating constraints if any. Use
// session.Delete("from System.Object");
// instead if in need of having NHibernate ordering the deletes, but this will cause
// loading the entities in the session.
session.CreateQuery("delete from System.Object").ExecuteUpdate();

transaction.Commit();
Expand All @@ -50,7 +45,7 @@ where e.Flag
select e;

Assert.That(
result.ToList,
() => result.ToList(),
Throws
.InnerException.TypeOf<InvalidOperationException>()
.And.InnerException.Message.Contains(nameof(IEnhancedUserType)));
Expand Down
8 changes: 4 additions & 4 deletions src/NHibernate.Test/NHibernate.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.109.2" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.11" />
<PackageReference Include="NSubstitute" Version="3.1.0" />
<PackageReference Include="NUnit" Version="3.10.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.3.0" />
<PackageReference Include="Npgsql" Version="4.0.3" />
</ItemGroup>
Expand All @@ -71,7 +71,7 @@
<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
<PackageReference Include="System.Data.Odbc" Version="4.5.0" />
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
<PackageReference Include="NUnitLite" Version="3.10.1" />
<PackageReference Include="NUnitLite" Version="3.12.0" />
<PackageReference Include="MySql.Data" Version="6.10.6" />
</ItemGroup>
<ItemGroup Condition=" '$(NuGetPackageRoot)' != '' ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
<ItemGroup>
<ProjectReference Include="..\NHibernate.Test\NHibernate.Test.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<PackageReference Include="NUnitLite" Version="3.10.1" />
<PackageReference Include="NUnitLite" Version="3.12.0" />
</ItemGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
Expand Down

0 comments on commit bc3f56b

Please sign in to comment.