Skip to content

Commit d7af751

Browse files
committed
NH-3807 - Include NUnitLite so it's possible to debug tests.
1 parent dfb39d7 commit d7af751

File tree

6 files changed

+40
-7
lines changed

6 files changed

+40
-7
lines changed

src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
88
<NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
9+
<GenerateProgramFile>false</GenerateProgramFile>
910

1011
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
1112
<IsPackable>false</IsPackable>
@@ -68,6 +69,7 @@
6869
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.7.6" />
6970
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.4.0" />
7071
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
72+
<PackageReference Include="NUnitLite" Version="3.7.2" />
7173
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
7274
</ItemGroup>
7375

src/NHibernate.Test/Program.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using NUnitLite;
2+
3+
namespace NHibernate.Test
4+
{
5+
class Program
6+
{
7+
/// <summary>
8+
/// Takes arguments like NUnit Config - https://github.com/nunit/docs/wiki/Console-Command-Line#options
9+
/// </summary>
10+
static int Main(string[] args)
11+
{
12+
return new AutoRun(typeof(Program).Assembly).Execute(args);
13+
}
14+
}
15+
}

src/NHibernate.Test/TestsContext.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public void RunBeforeAnyTests()
2323
public static HibernateConfiguration GetTestAssemblyHibernateConfiguration()
2424
{
2525
HibernateConfiguration config;
26-
string assemblyPath = Path.Combine(TestContext.CurrentContext.TestDirectory, @"NHibernate.Test.dll");
26+
string assemblyPath = Path.Combine(TestContext.CurrentContext.TestDirectory, Path.GetFileName(typeof(TestsContext).Assembly.Location));
27+
2728
var configuration = ConfigurationManager.OpenExeConfiguration(assemblyPath);
2829
ConfigurationSection configSection = configuration.GetSection(CfgXmlHelper.CfgSectionName);
2930

src/NHibernate.TestDatabaseSetup/App.config

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
</property>
1313
</session-factory>
1414
</hibernate-configuration>
15-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup><system.data>
16-
<DbProviderFactories>
17-
<remove invariant="FirebirdSql.Data.FirebirdClient" />
18-
<add name="FirebirdClient Data Provider" invariant="FirebirdSql.Data.FirebirdClient" description=".NET Framework Data Provider for Firebird" type="FirebirdSql.Data.FirebirdClient.FirebirdClientFactory, FirebirdSql.Data.FirebirdClient" />
19-
</DbProviderFactories>
20-
</system.data></configuration>
15+
<startup>
16+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
17+
</startup>
18+
</configuration>

src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
99
<NoWarn>$(NoWarn);3001;3002;3003;3005</NoWarn>
10+
<GenerateProgramFile>false</GenerateProgramFile>
1011

1112
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
1213
<IsPackable>false</IsPackable>
@@ -21,6 +22,7 @@
2122
<PackageReference Include="nunit" Version="3.7.1" />
2223
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
2324
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
25+
<PackageReference Include="NUnitLite" Version="3.7.2" />
2426
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="5.9.0.1" />
2527
<PackageReference Include="Npgsql" Version="3.2.5" />
2628
</ItemGroup>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using NUnitLite;
2+
3+
namespace NHibernate.TestDatabaseSetup
4+
{
5+
class Program
6+
{
7+
/// <summary>
8+
/// Takes arguments like NUnit Config - https://github.com/nunit/docs/wiki/Console-Command-Line#options
9+
/// </summary>
10+
static int Main(string[] args)
11+
{
12+
return new AutoRun(typeof(Program).Assembly).Execute(args);
13+
}
14+
}
15+
}

0 commit comments

Comments
 (0)