Skip to content

Commit f53e8f1

Browse files
committed
Solves original problem of closure instance capture
Also revert previous changes of conditional caching
1 parent 039535c commit f53e8f1

File tree

9 files changed

+77
-1802
lines changed

9 files changed

+77
-1802
lines changed

Orm/Xtensive.Orm.Tests/Issues/IssueGithub0224_DelayedQueryCapture.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ protected override DomainConfiguration BuildConfiguration()
9898
[Test]
9999
public void DelayedQueryWithIncludeTest()
100100
{
101-
var cachedItems = Domain.QueryCache.Count;
102101
using (var session = Domain.OpenSession())
103102
using (var t = session.OpenTransaction()) {
104103
var item = new Item() { Tag = 10 };
@@ -107,13 +106,11 @@ public void DelayedQueryWithIncludeTest()
107106
}
108107
TestHelper.CollectGarbage(true);
109108
Assert.AreEqual(0, OtherService1.InstanceCount);
110-
Assert.That(Domain.QueryCache.Count, Is.EqualTo(cachedItems));
111109
}
112110

113111
[Test]
114112
public void DelayedQueryWithContainsTest()
115113
{
116-
var cachedItems = Domain.QueryCache.Count;
117114
using (var session = Domain.OpenSession())
118115
using (var t = session.OpenTransaction()) {
119116
var item = new Item() { Tag = 10 };
@@ -123,13 +120,11 @@ public void DelayedQueryWithContainsTest()
123120

124121
TestHelper.CollectGarbage(true);
125122
Assert.AreEqual(0, OtherService2.InstanceCount);
126-
Assert.That(Domain.QueryCache.Count, Is.EqualTo(cachedItems));
127123
}
128124

129125
[Test]
130126
public void DelayedQueryWithEqualityTest()
131127
{
132-
var cachedItems = Domain.QueryCache.Count;
133128
using (var session = Domain.OpenSession())
134129
using (var t = session.OpenTransaction()) {
135130
var item = new Item() { Tag = 10 };
@@ -139,7 +134,6 @@ public void DelayedQueryWithEqualityTest()
139134

140135
TestHelper.CollectGarbage(true);
141136
Assert.AreEqual(0, OtherService3.InstanceCount);
142-
Assert.That(Domain.QueryCache.Count, Is.EqualTo(cachedItems + 1));
143137
}
144138

145139
private void DelayedQueryWithEquality(Session session)

0 commit comments

Comments
 (0)