Skip to content

Commit bc3f56b

Browse files
hazzikhazzik
committed
Upgrade NUnit
1 parent 218add4 commit bc3f56b

File tree

6 files changed

+86
-17
lines changed

6 files changed

+86
-17
lines changed

‎Tools/packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit.Console" version="3.7.0" targetFramework="net461" />
4-
<package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net461" />
3+
<package id="NUnit.Console" version="3.10.0" targetFramework="net461" />
4+
<package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net461" />
55
<package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net461" />
66
<package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net461" />
77
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
8-
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
9-
<package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
8+
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.6" targetFramework="net461" />
9+
<package id="NUnit.Extension.VSProjectLoader" version="3.8.0" targetFramework="net461" />
1010
<package id="CSharpAsyncGenerator.CommandLine" version="0.14.0" targetFramework="net461" />
1111
<package id="vswhere" version="2.1.4" targetFramework="net461" />
12-
<package id="gitreleasemanager" version="0.7.0" targetFramework="net461" />
12+
<package id="GitReleaseManager" version="0.7.0" targetFramework="net461" />
1313
</packages>

‎src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@
3232
<None Include="..\NHibernate.Test\App.config" Link="App.config" />
3333
</ItemGroup>
3434
<ItemGroup>
35+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
3536
<PackageReference Include="Microsoft.VisualBasic" Version="10.2.0" />
37+
<PackageReference Include="NUnit" Version="3.12.0" />
38+
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
3639
</ItemGroup>
3740
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
38-
<PackageReference Include="NUnitLite" Version="3.10.1" />
41+
<PackageReference Include="NUnitLite" Version="3.12.0" />
3942
</ItemGroup>
4043
<ItemGroup>
4144
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />

‎src/NHibernate.Test/Async/NHSpecificTest/GH1963/Fixture.cs

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated by AsyncGenerator.
4+
//
5+
// Changes to this file may cause incorrect behavior and will be lost if
6+
// the code is regenerated.
7+
// </auto-generated>
8+
//------------------------------------------------------------------------------
9+
10+
11+
using System;
12+
using System.Linq;
13+
using NHibernate.UserTypes;
14+
using NUnit.Framework;
15+
using NHibernate.Linq;
16+
17+
namespace NHibernate.Test.NHSpecificTest.GH1963
18+
{
19+
using System.Threading.Tasks;
20+
[TestFixture]
21+
public class FixtureAsync : BugTestCase
22+
{
23+
protected override void OnSetUp()
24+
{
25+
using (var session = OpenSession())
26+
using (var transaction = session.BeginTransaction())
27+
{
28+
var e1 = new Entity {Name = "Bob", Flag = true};
29+
session.Save(e1);
30+
31+
var e2 = new Entity {Name = "Sally"};
32+
session.Save(e2);
33+
34+
transaction.Commit();
35+
}
36+
}
37+
38+
protected override void OnTearDown()
39+
{
40+
using (var session = OpenSession())
41+
using (var transaction = session.BeginTransaction())
42+
{
43+
session.CreateQuery("delete from System.Object").ExecuteUpdate();
44+
45+
transaction.Commit();
46+
}
47+
}
48+
49+
[Test]
50+
public void LinqFilterOnNonLiteralCustomTypeAsync()
51+
{
52+
using (var session = OpenSession())
53+
using (session.BeginTransaction())
54+
{
55+
var result = from e in session.Query<Entity>()
56+
where e.Flag
57+
select e;
58+
59+
Assert.That(
60+
() => result.ToListAsync(),
61+
Throws
62+
.InnerException.TypeOf<InvalidOperationException>()
63+
.And.InnerException.Message.Contains(nameof(IEnhancedUserType)));
64+
}
65+
}
66+
}
67+
}

‎src/NHibernate.Test/NHSpecificTest/GH1963/Fixture.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ protected override void OnTearDown()
2828
using (var session = OpenSession())
2929
using (var transaction = session.BeginTransaction())
3030
{
31-
// The HQL delete does all the job inside the database without loading the entities, but it does
32-
// not handle delete order for avoiding violating constraints if any. Use
33-
// session.Delete("from System.Object");
34-
// instead if in need of having NHibernate ordering the deletes, but this will cause
35-
// loading the entities in the session.
3631
session.CreateQuery("delete from System.Object").ExecuteUpdate();
3732

3833
transaction.Commit();
@@ -50,7 +45,7 @@ where e.Flag
5045
select e;
5146

5247
Assert.That(
53-
result.ToList,
48+
() => result.ToList(),
5449
Throws
5550
.InnerException.TypeOf<InvalidOperationException>()
5651
.And.InnerException.Message.Contains(nameof(IEnhancedUserType)));

‎src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.109.2" />
5050
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.8.11" />
5151
<PackageReference Include="NSubstitute" Version="3.1.0" />
52-
<PackageReference Include="NUnit" Version="3.10.1" />
53-
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
54-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
52+
<PackageReference Include="NUnit" Version="3.12.0" />
53+
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
54+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
5555
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.3.0" />
5656
<PackageReference Include="Npgsql" Version="4.0.3" />
5757
</ItemGroup>
@@ -71,7 +71,7 @@
7171
<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
7272
<PackageReference Include="System.Data.Odbc" Version="4.5.0" />
7373
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
74-
<PackageReference Include="NUnitLite" Version="3.10.1" />
74+
<PackageReference Include="NUnitLite" Version="3.12.0" />
7575
<PackageReference Include="MySql.Data" Version="6.10.6" />
7676
</ItemGroup>
7777
<ItemGroup Condition=" '$(NuGetPackageRoot)' != '' ">

‎src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
<ItemGroup>
1515
<ProjectReference Include="..\NHibernate.Test\NHibernate.Test.csproj" />
1616
</ItemGroup>
17+
<ItemGroup>
18+
<PackageReference Include="NUnit" Version="3.12.0" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
20+
</ItemGroup>
1721
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
18-
<PackageReference Include="NUnitLite" Version="3.10.1" />
22+
<PackageReference Include="NUnitLite" Version="3.12.0" />
1923
</ItemGroup>
2024
<ItemGroup>
2125
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

0 commit comments

Comments
 (0)