Skip to content

Commit ec33689

Browse files
committed
Fix test and review suggestions
1 parent 83f502f commit ec33689

File tree

2 files changed

+76
-8
lines changed

2 files changed

+76
-8
lines changed

src/NHibernate.Test/Async/NHSpecificTest/GH3169/FixtureByCode.cs

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,51 @@ namespace NHibernate.Test.NHSpecificTest.GH3169
2020
[TestFixture]
2121
public class ByCodeFixtureAsync : TestCaseMappingByCode
2222
{
23-
public class ResultDto
23+
class ResultDto
2424
{
2525
public string regionCode { get; set; }
2626
}
2727

28+
class Entity
29+
{
30+
public virtual int Id { get; set; }
31+
public virtual string Name { get; set; }
32+
}
33+
2834
protected override HbmMapping GetMappings()
2935
{
3036
var mapper = new ModelMapper();
37+
mapper.Class<Entity>(rc =>
38+
{
39+
rc.Table("Entity");
40+
rc.Id(x => x.Id, m => m.Generator(Generators.Native));
41+
rc.Property(x => x.Name);
42+
});
43+
3144
return mapper.CompileMappingForAllExplicitlyAddedEntities();
3245
}
3346

47+
protected override void OnSetUp()
48+
{
49+
using (var session = OpenSession())
50+
using (var transaction = session.BeginTransaction())
51+
{
52+
var e1 = new Entity { Name = "Bob" };
53+
session.Save(e1);
54+
55+
transaction.Commit();
56+
}
57+
}
58+
59+
protected override void OnTearDown()
60+
{
61+
using (var session = OpenSession())
62+
using (var transaction = session.BeginTransaction())
63+
{
64+
session.CreateQuery("delete from System.Object").ExecuteUpdate();
65+
transaction.Commit();
66+
}
67+
}
3468

3569
[Test]
3670
public async Task CachedQueryWithTransformerAsync()
@@ -40,7 +74,7 @@ Task<IList<ResultDto>> GetCacheableSqlQueryResultsAsync(ISession s)
4074
try
4175
{
4276
return s.CreateSQLQuery(
43-
"select 'REGIONCODE' as regionCode ")
77+
"select Name as regionCode from Entity")
4478
.AddScalar("regionCode", NHibernateUtil.String)
4579
.SetResultTransformer(Transformers.AliasToBean<ResultDto>())
4680
.SetCacheable(true)
@@ -58,7 +92,7 @@ Task<IList<ResultDto>> GetCacheableSqlQueryResultsAsync(ISession s)
5892
{
5993
var l = await (GetCacheableSqlQueryResultsAsync(session));
6094
Assert.AreEqual(1, l.Count);
61-
//Uncomment if we properly fix caching auto discovery type queries with transformers
95+
//TODO: Uncomment if we properly fix caching auto discovery type queries with transformers
6296
//Assert.That(Sfi.Statistics.QueryCacheMissCount, Is.EqualTo(1), "results are expected from DB");
6397
//Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(0), "results are expected from DB");
6498
}
@@ -67,7 +101,7 @@ Task<IList<ResultDto>> GetCacheableSqlQueryResultsAsync(ISession s)
67101
{
68102
var l2 = await (GetCacheableSqlQueryResultsAsync(session));
69103
Assert.AreEqual(1, l2.Count);
70-
//Uncomment if we properly fix caching auto discovery type queries with transformers
104+
//TODO: Uncomment if we properly fix caching auto discovery type queries with transformers
71105
//Assert.That(Sfi.Statistics.QueryCacheMissCount, Is.EqualTo(0), "results are expected from cache");
72106
//Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(1), "results are expected from cache");
73107
}

src/NHibernate.Test/NHSpecificTest/GH3169/FixtureByCode.cs

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,59 @@ namespace NHibernate.Test.NHSpecificTest.GH3169
99
[TestFixture]
1010
public class ByCodeFixture : TestCaseMappingByCode
1111
{
12-
public class ResultDto
12+
class ResultDto
1313
{
1414
public string regionCode { get; set; }
1515
}
1616

17+
class Entity
18+
{
19+
public virtual int Id { get; set; }
20+
public virtual string Name { get; set; }
21+
}
22+
1723
protected override HbmMapping GetMappings()
1824
{
1925
var mapper = new ModelMapper();
26+
mapper.Class<Entity>(rc =>
27+
{
28+
rc.Table("Entity");
29+
rc.Id(x => x.Id, m => m.Generator(Generators.Native));
30+
rc.Property(x => x.Name);
31+
});
32+
2033
return mapper.CompileMappingForAllExplicitlyAddedEntities();
2134
}
2235

36+
protected override void OnSetUp()
37+
{
38+
using (var session = OpenSession())
39+
using (var transaction = session.BeginTransaction())
40+
{
41+
var e1 = new Entity { Name = "Bob" };
42+
session.Save(e1);
43+
44+
transaction.Commit();
45+
}
46+
}
47+
48+
protected override void OnTearDown()
49+
{
50+
using (var session = OpenSession())
51+
using (var transaction = session.BeginTransaction())
52+
{
53+
session.CreateQuery("delete from System.Object").ExecuteUpdate();
54+
transaction.Commit();
55+
}
56+
}
2357

2458
[Test]
2559
public void CachedQueryWithTransformer()
2660
{
2761
IList<ResultDto> GetCacheableSqlQueryResults(ISession s)
2862
{
2963
return s.CreateSQLQuery(
30-
"select 'REGIONCODE' as regionCode ")
64+
"select Name as regionCode from Entity")
3165
.AddScalar("regionCode", NHibernateUtil.String)
3266
.SetResultTransformer(Transformers.AliasToBean<ResultDto>())
3367
.SetCacheable(true)
@@ -40,7 +74,7 @@ IList<ResultDto> GetCacheableSqlQueryResults(ISession s)
4074
{
4175
var l = GetCacheableSqlQueryResults(session);
4276
Assert.AreEqual(1, l.Count);
43-
//Uncomment if we properly fix caching auto discovery type queries with transformers
77+
//TODO: Uncomment if we properly fix caching auto discovery type queries with transformers
4478
//Assert.That(Sfi.Statistics.QueryCacheMissCount, Is.EqualTo(1), "results are expected from DB");
4579
//Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(0), "results are expected from DB");
4680
}
@@ -49,7 +83,7 @@ IList<ResultDto> GetCacheableSqlQueryResults(ISession s)
4983
{
5084
var l2 = GetCacheableSqlQueryResults(session);
5185
Assert.AreEqual(1, l2.Count);
52-
//Uncomment if we properly fix caching auto discovery type queries with transformers
86+
//TODO: Uncomment if we properly fix caching auto discovery type queries with transformers
5387
//Assert.That(Sfi.Statistics.QueryCacheMissCount, Is.EqualTo(0), "results are expected from cache");
5488
//Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(1), "results are expected from cache");
5589
}

0 commit comments

Comments
 (0)