Skip to content

Commit 5dd7df1

Browse files
committed
use block scoped namespaces
1 parent 54c215c commit 5dd7df1

File tree

2 files changed

+55
-53
lines changed

2 files changed

+55
-53
lines changed
Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
11
using System.Collections.Generic;
22

3-
namespace NHibernate.Test.NHSpecificTest.GH3288;
4-
5-
class TopEntity
6-
{
7-
public virtual int Id { get; set; }
8-
public virtual MiddleEntity MiddleEntity { get; set; }
9-
}
10-
class MiddleEntity
11-
{
12-
public virtual int Id { get; set; }
13-
public virtual ISet<Component> Components { get; set; } = new HashSet<Component>();
14-
}
15-
16-
class Component
3+
namespace NHibernate.Test.NHSpecificTest.GH3288
174
{
18-
public virtual MiddleEntity MiddleEntity { get; set; }
19-
public virtual int Value { get; set; }
20-
21-
public override bool Equals(object obj)
5+
class TopEntity
6+
{
7+
public virtual int Id { get; set; }
8+
public virtual MiddleEntity MiddleEntity { get; set; }
9+
}
10+
class MiddleEntity
2211
{
23-
return (obj as Component)?.MiddleEntity.Id == MiddleEntity.Id;
12+
public virtual int Id { get; set; }
13+
public virtual ISet<Component> Components { get; set; } = new HashSet<Component>();
2414
}
2515

26-
public override int GetHashCode()
16+
class Component
2717
{
28-
return MiddleEntity.Id.GetHashCode();
18+
public virtual MiddleEntity MiddleEntity { get; set; }
19+
public virtual int Value { get; set; }
20+
21+
public override bool Equals(object obj)
22+
{
23+
return (obj as Component)?.MiddleEntity.Id == MiddleEntity.Id;
24+
}
25+
26+
public override int GetHashCode()
27+
{
28+
return MiddleEntity.Id.GetHashCode();
29+
}
2930
}
3031
}

src/NHibernate.Test/NHSpecificTest/GH3288/FetchAndCollectionJoinFixture.cs

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,46 @@
22
using NHibernate.Linq;
33
using NUnit.Framework;
44

5-
namespace NHibernate.Test.NHSpecificTest.GH3288;
6-
7-
[TestFixture]
8-
public class FetchAndCollectionJoinFixture : BugTestCase
5+
namespace NHibernate.Test.NHSpecificTest.GH3288
96
{
10-
protected override void OnSetUp()
7+
[TestFixture]
8+
public class FetchAndCollectionJoinFixture : BugTestCase
119
{
12-
using var session = OpenSession();
13-
using var transaction = session.BeginTransaction();
14-
var middleEntity = new MiddleEntity();
15-
middleEntity.Components.Add(new Component { MiddleEntity = middleEntity, Value = 1 });
16-
var te = new TopEntity
10+
protected override void OnSetUp()
1711
{
18-
MiddleEntity = middleEntity
19-
};
20-
session.Save(middleEntity);
21-
session.Save(te);
12+
using var session = OpenSession();
13+
using var transaction = session.BeginTransaction();
14+
var middleEntity = new MiddleEntity();
15+
middleEntity.Components.Add(new Component { MiddleEntity = middleEntity, Value = 1 });
16+
var te = new TopEntity
17+
{
18+
MiddleEntity = middleEntity
19+
};
20+
session.Save(middleEntity);
21+
session.Save(te);
2222

23-
transaction.Commit();
24-
}
23+
transaction.Commit();
24+
}
2525

26-
protected override void OnTearDown()
27-
{
28-
using var session = OpenSession();
29-
using var transaction = session.BeginTransaction();
30-
session.Delete("from System.Object");
26+
protected override void OnTearDown()
27+
{
28+
using var session = OpenSession();
29+
using var transaction = session.BeginTransaction();
30+
session.Delete("from System.Object");
3131

32-
transaction.Commit();
33-
}
32+
transaction.Commit();
33+
}
3434

35-
[Test]
36-
public void ReuseEntityJoinWithCollectionJoin()
37-
{
38-
using var session = OpenSession();
35+
[Test]
36+
public void ReuseEntityJoinWithCollectionJoin()
37+
{
38+
using var session = OpenSession();
3939

40-
var entities = session.Query<TopEntity>()
41-
.Fetch(e => e.MiddleEntity)
42-
.Where(e => e.MiddleEntity.Components.Any(e => e.Value != 0))
43-
.ToList();
44-
Assert.That(entities.Count, Is.EqualTo(1));
40+
var entities = session.Query<TopEntity>()
41+
.Fetch(e => e.MiddleEntity)
42+
.Where(e => e.MiddleEntity.Components.Any(e => e.Value != 0))
43+
.ToList();
44+
Assert.That(entities.Count, Is.EqualTo(1));
45+
}
4546
}
4647
}

0 commit comments

Comments
 (0)