Skip to content

Commit 4342d5f

Browse files
committed
Event/listeners behavior ported.
The free test changed are for minor issue ConfigurationSchemaFixture : New name space FooBarTest : H3.2 use NotFoundException on Load with deleted items too NH350/Fixture.cs : Now we have a special exception for TypeMismatch Problem in MasterDetailTest.Copy for different behavior H3.2 and NH (we need to change the test with the same implementations of H3.2) SVN: trunk@3005
1 parent 32e098a commit 4342d5f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1194
-4527
lines changed

src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.Configuration;
3-
3+
using NHibernate.Event;
44
using NUnit.Framework;
55
using NHibernate.Cfg;
66
using NHibernate.Cfg.ConfigurationSchema;

src/NHibernate.Test/Legacy/FooBarTest.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5004,7 +5004,8 @@ public void LoadAfterDelete()
50045004
{
50055005
s.Load(typeof(Foo), id);
50065006
}
5007-
catch (ObjectDeletedException ode)
5007+
//catch (ObjectDeletedException ode) Changed to have same behavior of H3.2
5008+
catch (ObjectNotFoundException ode)
50085009
{
50095010
Assert.IsNotNull(ode); //getting ride of 'ode' is never used compile warning
50105011
err = true;
@@ -5037,7 +5038,8 @@ public void LoadAfterDelete()
50375038
{
50385039
s.Load(typeof(Fo), id);
50395040
}
5040-
catch (ObjectDeletedException ode)
5041+
//catch (ObjectDeletedException ode) Changed to have same behavior of H3.2
5042+
catch (ObjectNotFoundException ode)
50415043
{
50425044
Assert.IsNotNull(ode); //getting ride of 'ode' is never used compile warning
50435045
err = true;

src/NHibernate.Test/NHSpecificTest/NH350/Fixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public override string BugNumber
1313

1414
// We pass an Int32 id to Load and expect an exception, since the class
1515
// uses Int64 ids.
16-
[Test, ExpectedException(typeof(ArgumentException))]
16+
[Test, ExpectedException(typeof(TypeMismatchException))]
1717
public void Loading()
1818
{
1919
object parentId;

src/NHibernate/Action/EntityIdentityInsertAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public EntityIdentityInsertAction(object[] state, object instance, IEntityPersis
1919
{
2020
this.state = state;
2121
this.isDelayed = isDelayed;
22-
delayedEntityKey = isDelayed ? GenerateDelayedEntityKey() : null;
22+
delayedEntityKey = this.isDelayed ? GenerateDelayedEntityKey() : null;
2323
}
2424

2525
public object GeneratedId

0 commit comments

Comments
 (0)