Skip to content

Commit 09c50f4

Browse files
committed
NH-3807 - Include some DriverTest fixtures again.
Also document why tests are excluded in the .csproj file.
1 parent 638f27f commit 09c50f4

6 files changed

+24
-17
lines changed

src/NHibernate.Test/DriverTest/DbProviderFactoryDriveConnectionCommandProviderTest.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if !NETCOREAPP2_0
12
using System;
23
using System.Data.Common;
34
using NHibernate.Driver;
@@ -35,4 +36,5 @@ public void WhenCreatedWithDbFactoryThenCanReturnCommand()
3536
}
3637
}
3738
}
38-
}
39+
}
40+
#endif

src/NHibernate.Test/DriverTest/OracleClientDriverFixture.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if !NETCOREAPP2_0
12
using System;
23
using System.Data.Common;
34
using NHibernate.Driver;
@@ -35,4 +36,5 @@ public void CommandClassName()
3536
Assert.AreEqual("System.Data.OracleClient.OracleCommand", cmd.GetType().FullName);
3637
}
3738
}
38-
}
39+
}
40+
#endif

src/NHibernate.Test/DriverTest/OracleDataClientDriverFixture.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if !NETCOREAPP2_0
12
using System;
23
using System.Data;
34
using System.Data.Common;
@@ -34,4 +35,5 @@ public void NoBooleanParameters()
3435
Assert.IsFalse(param.DbType == DbType.Boolean, "should not still be a DbType.Boolean");
3536
}
3637
}
37-
}
38+
}
39+
#endif

src/NHibernate.Test/DriverTest/ReflectionBasedDriverTest.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if !NETCOREAPP2_0
12
using System;
23
using NHibernate.Driver;
34
using NUnit.Framework;
@@ -114,4 +115,5 @@ public void WhenCreatedNoWithDbFactoryThenCanReturnCommand()
114115
}
115116
}
116117
}
117-
}
118+
}
119+
#endif

src/NHibernate.Test/ExceptionsTest/OracleClientExceptionConverterExample.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if !NETCOREAPP2_0
12
using System;
23
using System.Data.OracleClient;
34
using NHibernate.Exceptions;
@@ -27,4 +28,5 @@ public Exception Convert(AdoExceptionContextInfo exInfo)
2728

2829
#endregion
2930
}
30-
}
31+
}
32+
#endif

src/NHibernate.Test/NHibernate.Test.csproj

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,17 @@
1616
</ItemGroup>
1717

1818
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
19-
<Compile Remove="DriverTest\**" />
2019
<Compile Remove="NHSpecificTest\DtcFailures\**" /> <!--Distributed-->
21-
<Compile Remove="NHSpecificTest\NH2188\**" />
20+
<Compile Remove="NHSpecificTest\NH2188\**" /> <!--Uses AppDomain.CurrentDomain.SetupInformation-->
2221
<Compile Remove="NHSpecificTest\NH2420\**" /> <!--Distributed-->
23-
<Compile Remove="NHSpecificTest\NH2484\**" />
24-
<Compile Remove="NHSpecificTest\NH2985\**" />
25-
<Compile Remove="NHSpecificTest\NH3121\**" />
26-
<Compile Remove="SqlTest\Custom\Oracle\**" />
27-
<Compile Remove="CfgTest\DefaultNsAssmFixture.cs" />
28-
<Compile Remove="CfgTest\HbmOrderingFixture.cs" />
29-
<Compile Remove="DynamicProxyTests\PeVerifier.cs" />
30-
<Compile Remove="DynamicProxyTests\PeVerifyFixture.cs" />
31-
<Compile Remove="ExceptionsTest\OracleClientExceptionConverterExample.cs" />
32-
<Compile Remove="ExceptionsTest\PostgresExceptionConverterExample.cs" />
22+
<Compile Remove="NHSpecificTest\NH2484\**" /> <!--Uses Image type-->
23+
<Compile Remove="NHSpecificTest\NH2985\**" /> <!--Uses Bitmap type-->
24+
<Compile Remove="NHSpecificTest\NH3121\**" /> <!--Uses Image type-->
25+
<Compile Remove="SqlTest\Custom\Oracle\**" /> <!--No Oracle driver-->
26+
<Compile Remove="CfgTest\DefaultNsAssmFixture.cs" /> <!--Uses DefineDynamicAssembly-->
27+
<Compile Remove="CfgTest\HbmOrderingFixture.cs" /> <!--Uses DefineDynamicAssembly-->
28+
<Compile Remove="DynamicProxyTests\PeVerifier.cs" /> <!--Only for dynamic assemblies-->
29+
<Compile Remove="DynamicProxyTests\PeVerifyFixture.cs" /> <!--Uses appDomain.DefineDynamicAssembly-->
3330
</ItemGroup>
3431

3532
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">

0 commit comments

Comments
 (0)