Skip to content

Commit 78125d7

Browse files
committed
NH-1941 - Fix tests for dialects with delayed save (for ex. sequence based IDs)
1 parent 9c3a4c7 commit 78125d7

File tree

1 file changed

+31
-21
lines changed
  • src/NHibernate.Test/NHSpecificTest/NH1941

1 file changed

+31
-21
lines changed

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

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,45 +7,55 @@ namespace NHibernate.Test.NHSpecificTest.NH1941
77
[TestFixture]
88
public class Fixture : BugTestCase
99
{
10-
1110
protected override void OnTearDown()
1211
{
13-
base.OnTearDown();
14-
using (ISession s = OpenSession())
12+
using (var s = OpenSession())
13+
using (var t = s.BeginTransaction())
1514
{
1615
s.Delete("from Person");
16+
17+
t.Commit();
1718
}
1819
}
20+
1921
[Test]
20-
public void CanOverrideStringEnumGetValue()
22+
public void SaveCanOverrideStringEnumGetValue()
2123
{
22-
string paramPrefix = ((DriverBase) Sfi.ConnectionProvider.Driver).NamedPrefix;
23-
using (ISession s = OpenSession())
24-
using (ITransaction tx = s.BeginTransaction())
24+
var paramPrefix = ((DriverBase) Sfi.ConnectionProvider.Driver).NamedPrefix;
25+
using (var ls = new SqlLogSpy())
2526
{
26-
using (SqlLogSpy ls = new SqlLogSpy())
27+
using (var s = OpenSession())
28+
using (var t = s.BeginTransaction())
2729
{
28-
Person person = new Person() { Sex = Sex.Male };
30+
var person = new Person { Sex = Sex.Male };
2931
s.Save(person);
3032

31-
string log = ls.GetWholeLog();
32-
Assert.IsTrue(log.Contains(paramPrefix + "p0 = 'M'"));
33+
t.Commit();
3334
}
35+
36+
var log = ls.GetWholeLog();
37+
Assert.That(log.Contains(paramPrefix + "p0 = 'M'"), Is.True);
38+
}
39+
}
3440

35-
using (SqlLogSpy ls = new SqlLogSpy())
41+
[Test]
42+
public void ReadCanOverrideStringEnumGetValue()
43+
{
44+
var paramPrefix = ((DriverBase) Sfi.ConnectionProvider.Driver).NamedPrefix;
45+
using (var ls = new SqlLogSpy())
46+
{
47+
using (var s = OpenSession())
48+
using (s.BeginTransaction())
3649
{
37-
Person person =
38-
s.CreateQuery("from Person p where p.Sex = :personSex")
39-
.SetParameter("personSex", Sex.Female)
40-
.UniqueResult<Person>();
50+
var person = s.CreateQuery("from Person p where p.Sex = :personSex")
51+
.SetParameter("personSex", Sex.Female)
52+
.UniqueResult<Person>();
4153

4254
Assert.That(person, Is.Null);
43-
44-
string log = ls.GetWholeLog();
45-
Assert.IsTrue(log.Contains(paramPrefix + "p0 = 'F'"));
4655
}
47-
48-
tx.Rollback();
56+
57+
string log = ls.GetWholeLog();
58+
Assert.IsTrue(log.Contains(paramPrefix + "p0 = 'F'"));
4959
}
5060
}
5161
}

0 commit comments

Comments
 (0)