Skip to content

Commit d166415

Browse files
hazzikbahusoid
authored andcommitted
Add mixed documents
1 parent 101483c commit d166415

File tree

1 file changed

+19
-18
lines changed
  • src/NHibernate.Test/NHSpecificTest/GH1994

1 file changed

+19
-18
lines changed

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Linq;
22
using NHibernate.Linq;
3+
using NHibernate.Transform;
34
using NUnit.Framework;
45

56
namespace NHibernate.Test.NHSpecificTest.GH1994
@@ -13,8 +14,8 @@ protected override void OnSetUp()
1314
using (var transaction = session.BeginTransaction())
1415
{
1516
var a = new Asset();
16-
var d = new Document { IsDeleted = true };
17-
a.Documents.Add(d);
17+
a.Documents.Add(new Document { IsDeleted = true });
18+
a.Documents.Add(new Document { IsDeleted = false });
1819

1920
session.Save(a);
2021
transaction.Commit();
@@ -43,12 +44,12 @@ public void TestUnfilteredLinqQuery()
4344
{
4445
using (var s = OpenSession())
4546
{
46-
var assetsUnfiltered = s.Query<Asset>()
47-
.FetchMany(x => x.Documents)
48-
.ToList();
47+
var query = s.Query<Asset>()
48+
.FetchMany(x => x.Documents)
49+
.ToList();
4950

50-
Assert.That(assetsUnfiltered.Count, Is.EqualTo(1), "unfiltered assets");
51-
Assert.That(assetsUnfiltered[0].Documents.Count, Is.EqualTo(1), "unfiltered asset documents");
51+
Assert.That(query.Count, Is.EqualTo(1), "unfiltered assets");
52+
Assert.That(query[0].Documents.Count, Is.EqualTo(2), "unfiltered asset documents");
5253
}
5354
}
5455

@@ -58,13 +59,12 @@ public void TestFilteredLinqQuery()
5859
using (var s = OpenSession())
5960
{
6061
s.EnableFilter("deletedFilter").SetParameter("deletedParam", false);
62+
var query = s.Query<Asset>()
63+
.FetchMany(x => x.Documents)
64+
.ToList();
6165

62-
var assetsFilteredQuery = s.Query<Asset>()
63-
.FetchMany(x => x.Documents)
64-
.ToList();
65-
66-
Assert.That(assetsFilteredQuery.Count, Is.EqualTo(1), "query filtered assets");
67-
Assert.That(assetsFilteredQuery[0].Documents.Count, Is.EqualTo(0), "query filtered asset documents");
66+
Assert.That(query.Count, Is.EqualTo(1), "filtered assets");
67+
Assert.That(query[0].Documents.Count, Is.EqualTo(1), "filtered asset documents");
6868
}
6969
}
7070

@@ -75,12 +75,13 @@ public void TestFilteredQueryOver()
7575
{
7676
s.EnableFilter("deletedFilter").SetParameter("deletedParam", false);
7777

78-
var assetsFilteredQueryOver = s.QueryOver<Asset>()
79-
.Fetch(SelectMode.Fetch, x => x.Documents)
80-
.List<Asset>();
78+
var query = s.QueryOver<Asset>()
79+
.Fetch(SelectMode.Fetch, x => x.Documents)
80+
.TransformUsing(Transformers.DistinctRootEntity)
81+
.List<Asset>();
8182

82-
Assert.That(assetsFilteredQueryOver.Count, Is.EqualTo(1), " query over filtered assets");
83-
Assert.That(assetsFilteredQueryOver[0].Documents.Count, Is.EqualTo(0), "query over filtered asset documents");
83+
Assert.That(query.Count, Is.EqualTo(1), "filtered assets");
84+
Assert.That(query[0].Documents.Count, Is.EqualTo(1), "filtered asset documents");
8485
}
8586
}
8687
}

0 commit comments

Comments
 (0)