Skip to content

Commit 7f8b5ed

Browse files
ngbrownngbrown
committed
NH-3807 - Test project
1 parent f96ab1e commit 7f8b5ed

35 files changed

+292
-4143
lines changed

‎src/NHibernate.Test/App.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<qualifyAssembly partialName="System.Web" fullName="System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
1818
<dependentAssembly>
1919
<assemblyIdentity name="Remotion.Linq" publicKeyToken="fee00910d6e5f53b" culture="neutral" />
20-
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
20+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
2121
</dependentAssembly>
2222
</assemblyBinding>
2323
</runtime>
@@ -107,7 +107,7 @@
107107
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
108108
<dependentAssembly>
109109
<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
110-
<bindingRedirect oldVersion="0.0.0.0-2.6.1.12217" newVersion="2.6.1.12217" />
110+
<bindingRedirect oldVersion="0.0.0.0-3.6.1.0" newVersion="3.6.1.0" />
111111
</dependentAssembly>
112112
</assemblyBinding>
113113
</runtime>

‎src/NHibernate.Test/CrossThreadTestRunner.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ private void Run()
5757
}
5858
}
5959

60+
#if !NETCOREAPP2_0
6061
[ReflectionPermission(SecurityAction.Demand)]
62+
#endif
6163
private static void ThrowExceptionPreservingStack(Exception exception)
6264
{
6365
if (RemoteStackTraceField != null)

‎src/NHibernate.Test/DynamicProxyTests/LazyFieldInterceptorTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void LazyFieldInterceptorIsBinarySerializable()
3535
var fieldInterceptionProxy = (IFieldInterceptorAccessor)pf.GetFieldInterceptionProxy(new MyClass());
3636
fieldInterceptionProxy.FieldInterceptor = new DefaultFieldInterceptor(null, null, null, "MyClass", typeof(MyClass));
3737

38-
Assert.That(fieldInterceptionProxy, Is.BinarySerializable);
38+
NHAssert.IsSerializable(fieldInterceptionProxy);
3939
}
4040

4141

‎src/NHibernate.Test/ExceptionsTest/SQLExceptionConversionTest.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
3232
protected override bool AppliesTo(ISessionFactoryImplementor factory)
3333
{
3434
var driver = factory.ConnectionProvider.Driver;
35-
return !(driver is OracleDataClientDriver) && !(driver is OracleManagedDataAccessDriver) && !(driver is OracleLiteDataClientDriver) && !(driver is OdbcDriver) && !(driver is OleDbDriver);
35+
return !(driver.IsOracleDataClientDriver()) && !(driver.IsOracleManagedDataAccessDriver()) && !(driver.IsOracleLiteDataClientDriver()) && !(driver.IsOdbcDriver()) && !(driver.IsOleDbDriver());
3636
}
3737

3838
protected override void Configure(Cfg.Configuration configuration)
@@ -44,6 +44,7 @@ protected override void Configure(Cfg.Configuration configuration)
4444
typeof(MSSQLExceptionConverterExample).AssemblyQualifiedName);
4545
}
4646

47+
#if !NETCOREAPP2_0
4748
if (Dialect is Oracle8iDialect)
4849
{
4950
configuration.SetProperty(
@@ -57,8 +58,9 @@ protected override void Configure(Cfg.Configuration configuration)
5758
Cfg.Environment.SqlExceptionConverter,
5859
typeof(PostgresExceptionConverterExample).AssemblyQualifiedName);
5960
}
61+
#endif
6062

61-
if (Dialect is FirebirdDialect)
63+
if (Dialect is FirebirdDialect)
6264
{
6365
configuration.SetProperty(
6466
Cfg.Environment.SqlExceptionConverter,

‎src/NHibernate.Test/Hql/Ast/LimitClauseFixture.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ public class LimitClauseFixture : BaseFixture
1010
{
1111
protected override bool AppliesTo(Dialect.Dialect dialect)
1212
{
13+
#if NETCOREAPP2_0
14+
return dialect.SupportsVariableLimit;
15+
#else
1316
return dialect.SupportsVariableLimit
1417
&& !(Dialect is Dialect.MsSql2000Dialect && cfg.Properties[Environment.ConnectionDriver] == typeof(Driver.OdbcDriver).FullName); // don't know why, but these tests don't work on SQL Server using ODBC
18+
#endif
1519
}
1620

1721
protected override void OnSetUp()
@@ -175,4 +179,4 @@ public void TakeWithParameter()
175179
s.Close();
176180
}
177181
}
178-
}
182+
}

‎src/NHibernate.Test/Linq/ByMethod/GroupByTests.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ public void GroupByComputedValue()
534534
{
535535
if (Dialect is FirebirdDialect)
536536
Assert.Ignore("Firebird does not support complex group by expressions");
537-
if (sessions.ConnectionProvider.Driver is OdbcDriver)
537+
if (sessions.ConnectionProvider.Driver.IsOdbcDriver())
538538
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
539539
if (Dialect is MsSqlCeDialect)
540540
Assert.Ignore("SQL Server CE does not support complex group by expressions.");
@@ -548,7 +548,7 @@ public void GroupByComputedValueInAnonymousType()
548548
{
549549
if (Dialect is FirebirdDialect)
550550
Assert.Ignore("Firebird does not support complex group by expressions");
551-
if (sessions.ConnectionProvider.Driver is OdbcDriver)
551+
if (sessions.ConnectionProvider.Driver.IsOdbcDriver())
552552
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
553553
if (Dialect is MsSqlCeDialect)
554554
Assert.Ignore("SQL Server CE does not support complex group by expressions.");
@@ -562,7 +562,7 @@ public void GroupByComputedValueInObjectArray()
562562
{
563563
if (Dialect is FirebirdDialect)
564564
Assert.Ignore("Firebird does not support complex group by expressions");
565-
if (sessions.ConnectionProvider.Driver is OdbcDriver)
565+
if (sessions.ConnectionProvider.Driver.IsOdbcDriver())
566566
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
567567
if (Dialect is MsSqlCeDialect)
568568
Assert.Ignore("SQL Server CE does not support complex group by expressions.");
@@ -693,7 +693,7 @@ public void GroupByComputedValueWithJoinOnObject()
693693
{
694694
if (Dialect is FirebirdDialect)
695695
Assert.Ignore("Firebird does not support complex group by expressions");
696-
if (sessions.ConnectionProvider.Driver is OdbcDriver)
696+
if (sessions.ConnectionProvider.Driver.IsOdbcDriver())
697697
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
698698
if (Dialect is MsSqlCeDialect)
699699
Assert.Ignore("SQL Server CE does not support complex group by expressions.");
@@ -707,7 +707,7 @@ public void GroupByComputedValueWithJoinOnId()
707707
{
708708
if (Dialect is FirebirdDialect)
709709
Assert.Ignore("Firebird does not support complex group by expressions");
710-
if (sessions.ConnectionProvider.Driver is OdbcDriver)
710+
if (sessions.ConnectionProvider.Driver.IsOdbcDriver())
711711
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
712712
if (Dialect is MsSqlCeDialect)
713713
Assert.Ignore("SQL Server CE does not support complex group by expressions.");
@@ -721,7 +721,7 @@ public void GroupByComputedValueInAnonymousTypeWithJoinOnObject()
721721
{
722722
if (Dialect is FirebirdDialect)
723723
Assert.Ignore("Firebird does not support complex group by expressions");
724-
if (sessions.ConnectionProvider.Driver is OdbcDriver)
724+
if (sessions.ConnectionProvider.Driver.IsOdbcDriver())
725725
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
726726
if (Dialect is MsSqlCeDialect)
727727
Assert.Ignore("SQL Server CE does not support complex group by expressions.");
@@ -735,7 +735,7 @@ public void GroupByComputedValueInAnonymousTypeWithJoinOnId()
735735
{
736736
if (Dialect is FirebirdDialect)
737737
Assert.Ignore("Firebird does not support complex group by expressions");
738-
if (sessions.ConnectionProvider.Driver is OdbcDriver)
738+
if (sessions.ConnectionProvider.Driver.IsOdbcDriver())
739739
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
740740
if (Dialect is MsSqlCeDialect)
741741
Assert.Ignore("SQL Server CE does not support complex group by expressions.");
@@ -749,7 +749,7 @@ public void GroupByComputedValueInObjectArrayWithJoinOnObject()
749749
{
750750
if (Dialect is FirebirdDialect)
751751
Assert.Ignore("Firebird does not support complex group by expressions");
752-
if (sessions.ConnectionProvider.Driver is OdbcDriver)
752+
if (sessions.ConnectionProvider.Driver.IsOdbcDriver())
753753
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
754754
if (Dialect is MsSqlCeDialect)
755755
Assert.Ignore("SQL Server CE does not support complex group by expressions.");
@@ -763,7 +763,7 @@ public void GroupByComputedValueInObjectArrayWithJoinOnId()
763763
{
764764
if (Dialect is FirebirdDialect)
765765
Assert.Ignore("Firebird does not support complex group by expressions");
766-
if (sessions.ConnectionProvider.Driver is OdbcDriver)
766+
if (sessions.ConnectionProvider.Driver.IsOdbcDriver())
767767
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
768768
if (Dialect is MsSqlCeDialect)
769769
Assert.Ignore("SQL Server CE does not support complex group by expressions.");
@@ -777,7 +777,7 @@ public void GroupByComputedValueInObjectArrayWithJoinInRightSideOfCase()
777777
{
778778
if (Dialect is FirebirdDialect)
779779
Assert.Ignore("Firebird does not support complex group by expressions");
780-
if (sessions.ConnectionProvider.Driver is OdbcDriver)
780+
if (sessions.ConnectionProvider.Driver.IsOdbcDriver())
781781
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
782782
if (Dialect is MsSqlCeDialect)
783783
Assert.Ignore("SQL Server CE does not support complex group by expressions.");
@@ -791,7 +791,7 @@ public void GroupByComputedValueFromNestedArraySelect()
791791
{
792792
if (Dialect is FirebirdDialect)
793793
Assert.Ignore("Firebird does not support complex group by expressions");
794-
if (sessions.ConnectionProvider.Driver is OdbcDriver)
794+
if (sessions.ConnectionProvider.Driver.IsOdbcDriver())
795795
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
796796
if (Dialect is MsSqlCeDialect)
797797
Assert.Ignore("SQL Server CE does not support complex group by expressions.");
@@ -805,7 +805,7 @@ public void GroupByComputedValueFromNestedObjectSelect()
805805
{
806806
if (Dialect is FirebirdDialect)
807807
Assert.Ignore("Firebird does not support complex group by expressions");
808-
if (sessions.ConnectionProvider.Driver is OdbcDriver)
808+
if (sessions.ConnectionProvider.Driver.IsOdbcDriver())
809809
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
810810
if (Dialect is MsSqlCeDialect)
811811
Assert.Ignore("SQL Server CE does not support complex group by expressions.");

‎src/NHibernate.Test/MappingByCode/For.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static MemberInfo Property(Expression<Func<T, object>> propertyGetter)
1313
{
1414
return null;
1515
}
16-
return TypeExtensions.DecodeMemberAccessExpression(propertyGetter);
16+
return Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpression(propertyGetter);
1717
}
1818
}
19-
}
19+
}

‎src/NHibernate.Test/MappingByCode/TypeExtensionsTests/TypeExtensionsTest.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,47 +52,47 @@ private class MyClass : MyBaseClass
5252
[Test]
5353
public void DecodeMemberAccessExpressionShouldReturnMemberOfDeclaringClass()
5454
{
55-
var mi1 = TypeExtensions.DecodeMemberAccessExpression<MyClass>(mc => mc.BaseProperty);
55+
var mi1 = Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpression<MyClass>(mc => mc.BaseProperty);
5656
Assert.That(mi1.DeclaringType, Is.EqualTo(typeof (MyBaseClass)));
5757
Assert.That(mi1.ReflectedType, Is.EqualTo(typeof (MyBaseClass)));
5858

59-
var mi2 = TypeExtensions.DecodeMemberAccessExpression<MyClass>(mc => mc.BaseBool);
59+
var mi2 = Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpression<MyClass>(mc => mc.BaseBool);
6060
Assert.That(mi2.DeclaringType, Is.EqualTo(typeof(MyBaseClass)));
6161
Assert.That(mi2.ReflectedType, Is.EqualTo(typeof(MyBaseClass)));
6262
}
6363

6464
[Test]
6565
public void GenericDecodeMemberAccessExpressionShouldReturnMemberOfDeclaringClass()
6666
{
67-
var mi1 = TypeExtensions.DecodeMemberAccessExpression<MyClass, string>(mc => mc.BaseProperty);
67+
var mi1 = Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpression<MyClass, string>(mc => mc.BaseProperty);
6868
Assert.That(mi1.DeclaringType, Is.EqualTo(typeof(MyBaseClass)));
6969
Assert.That(mi1.ReflectedType, Is.EqualTo(typeof(MyBaseClass)));
7070

71-
var mi2 = TypeExtensions.DecodeMemberAccessExpression<MyClass, bool>(mc => mc.BaseBool);
71+
var mi2 = Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpression<MyClass, bool>(mc => mc.BaseBool);
7272
Assert.That(mi2.DeclaringType, Is.EqualTo(typeof(MyBaseClass)));
7373
Assert.That(mi2.ReflectedType, Is.EqualTo(typeof(MyBaseClass)));
7474
}
7575

7676
[Test]
7777
public void DecodeMemberAccessExpressionOfShouldReturnMemberOfRequiredClass()
7878
{
79-
var mi1 = TypeExtensions.DecodeMemberAccessExpressionOf<MyClass>(mc => mc.BaseProperty);
79+
var mi1 = Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpressionOf<MyClass>(mc => mc.BaseProperty);
8080
Assert.That(mi1.DeclaringType, Is.EqualTo(typeof (MyBaseClass)));
8181
Assert.That(mi1.ReflectedType, Is.EqualTo(typeof (MyClass)));
8282

83-
var mi2 = TypeExtensions.DecodeMemberAccessExpressionOf<MyClass>(mc => mc.BaseBool);
83+
var mi2 = Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpressionOf<MyClass>(mc => mc.BaseBool);
8484
Assert.That(mi2.DeclaringType, Is.EqualTo(typeof(MyBaseClass)));
8585
Assert.That(mi2.ReflectedType, Is.EqualTo(typeof(MyClass)));
8686
}
8787

8888
[Test]
8989
public void GenericDecodeMemberAccessExpressionOfShouldReturnMemberOfRequiredClass()
9090
{
91-
var mi1 = TypeExtensions.DecodeMemberAccessExpressionOf<MyClass, string>(mc => mc.BaseProperty);
91+
var mi1 = Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpressionOf<MyClass, string>(mc => mc.BaseProperty);
9292
Assert.That(mi1.DeclaringType, Is.EqualTo(typeof(MyBaseClass)));
9393
Assert.That(mi1.ReflectedType, Is.EqualTo(typeof(MyClass)));
9494

95-
var mi2 = TypeExtensions.DecodeMemberAccessExpressionOf<MyClass, bool>(mc => mc.BaseBool);
95+
var mi2 = Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpressionOf<MyClass, bool>(mc => mc.BaseBool);
9696
Assert.That(mi2.DeclaringType, Is.EqualTo(typeof(MyBaseClass)));
9797
Assert.That(mi2.ReflectedType, Is.EqualTo(typeof(MyClass)));
9898
}
@@ -126,11 +126,11 @@ private class MyEntity: BaseEntity
126126
[Test]
127127
public void DecodeMemberAccessExpressionOfWithGenericShouldReturnMemberOfRequiredClass()
128128
{
129-
var mi1 = TypeExtensions.DecodeMemberAccessExpressionOf<MyEntity>(mc => mc.Id);
129+
var mi1 = Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpressionOf<MyEntity>(mc => mc.Id);
130130
Assert.That(mi1.DeclaringType, Is.EqualTo(typeof (BaseEntity)));
131131
Assert.That(mi1.ReflectedType, Is.EqualTo(typeof (MyEntity)));
132132

133-
var mi2 = TypeExtensions.DecodeMemberAccessExpressionOf<MyEntity>(mc => mc.BaseBool);
133+
var mi2 = Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpressionOf<MyEntity>(mc => mc.BaseBool);
134134
Assert.That(mi2.DeclaringType, Is.EqualTo(typeof(BaseEntity)));
135135
Assert.That(mi2.ReflectedType, Is.EqualTo(typeof(MyEntity)));
136136
}
@@ -185,8 +185,8 @@ private interface IMyEntity : IEntity<Guid>
185185
[Test]
186186
public void WhenDecodeMemberAccessExpressionOfOnInheritedEntityInterfaceThenDecodeMember()
187187
{
188-
Assert.That(TypeExtensions.DecodeMemberAccessExpressionOf<IMyEntity>(m => m.Id), Is.Not.Null);
189-
Assert.That(TypeExtensions.DecodeMemberAccessExpressionOf<IMyEntity, Guid>(m => m.Id), Is.Not.Null);
188+
Assert.That(Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpressionOf<IMyEntity>(m => m.Id), Is.Not.Null);
189+
Assert.That(Mapping.ByCode.TypeExtensions.DecodeMemberAccessExpressionOf<IMyEntity, Guid>(m => m.Id), Is.Not.Null);
190190
}
191191

192192
[Test]
@@ -279,4 +279,4 @@ public void DetermineCollectionElementTypeShouldNotDetermineElementTypeWhenTypeI
279279
Assert.That(elementType, Is.Null);
280280
}
281281
}
282-
}
282+
}

‎src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ public void ReadSubClasses()
183183
Assert.That(metaAttribute, Is.Not.Null);
184184
}
185185

186+
#if !NETCOREAPP2_0
186187
[Test]
187188
public void XmlSerialization()
188189
{
@@ -194,5 +195,6 @@ public void XmlSerialization()
194195
Assert.That(mapping, Is.XmlSerializable);
195196
}
196197
}
198+
#endif
197199
}
198200
}

‎src/NHibernate.Test/NHAssert.cs‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,27 @@ public static void IsSerializable(object obj)
5353

5454
public static void IsSerializable(object obj, string message, params object[] args)
5555
{
56+
#if !NETCOREAPP2_0
5657
Assert.That(obj, Is.BinarySerializable, message, args);
58+
#else
59+
bool succeeded = false;
60+
var serializer = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
61+
var stream = new System.IO.MemoryStream();
62+
try
63+
{
64+
serializer.Serialize(stream, obj);
65+
66+
stream.Seek(0, System.IO.SeekOrigin.Begin);
67+
68+
succeeded = serializer.Deserialize(stream) != null;
69+
}
70+
catch (System.Runtime.Serialization.SerializationException)
71+
{
72+
// Ignore and return failure
73+
succeeded = false;
74+
}
75+
Assert.That(succeeded, message ?? $"Supplied Type {obj.GetType()} is not serializable", args);
76+
#endif
5777
}
5878

5979
#endregion
@@ -72,4 +92,4 @@ public static void IsSerializable(object obj, string message, params object[] ar
7292
return result;
7393
}
7494
}
75-
}
95+
}

0 commit comments

Comments
 (0)