Skip to content

Commit 38612a0

Browse files
hazzikhazzik
committed
Cleanup tests
1 parent 5f143fa commit 38612a0

File tree

2 files changed

+100
-86
lines changed

2 files changed

+100
-86
lines changed

‎src/NHibernate.Test/Async/NHSpecificTest/GH2454/FixtureByCode.cs

Lines changed: 50 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -53,68 +53,75 @@ protected override HbmMapping GetMappings()
5353
return mapper.CompileMappingForAllExplicitlyAddedEntities();
5454
}
5555

56-
[Test]
57-
public async Task SubqueryCorrelatedThroughConditionalAsync()
56+
protected override void OnSetUp()
5857
{
5958
using (var session = OpenSession())
6059
using (var transaction = session.BeginTransaction())
6160
{
62-
// data
63-
{
64-
// alpha entities
65-
var projectAlpha = new Project { Name = "Alpha" };
66-
await (session.SaveAsync(projectAlpha));
61+
// alpha entities
62+
var projectAlpha = new Project {Name = "Alpha"};
63+
session.Save(projectAlpha);
6764

68-
var componentAlpha = new Component { Project = projectAlpha, Name = "Thingie" };
69-
await (session.SaveAsync(componentAlpha));
65+
var componentAlpha = new Component {Project = projectAlpha, Name = "Thingie"};
66+
session.Save(componentAlpha);
7067

71-
var tagAlpha = new Tag { Component1 = componentAlpha, Name = "A20" };
72-
await (session.SaveAsync(tagAlpha));
68+
var tagAlpha = new Tag {Component1 = componentAlpha, Name = "A20"};
69+
session.Save(tagAlpha);
7370

74-
// beta entities
75-
var projectBeta = new Project { Name = "Beta" };
76-
await (session.SaveAsync(projectBeta));
71+
// beta entities
72+
var projectBeta = new Project {Name = "Beta"};
73+
session.Save(projectBeta);
7774

78-
var componentBeta = new Component { Project = projectBeta, Name = "Thingie" };
79-
await (session.SaveAsync(componentBeta));
75+
var componentBeta = new Component {Project = projectBeta, Name = "Thingie"};
76+
session.Save(componentBeta);
8077

81-
var tagBeta = new Tag { Component1 = componentBeta, Name = "B17" };
82-
await (session.SaveAsync(tagBeta));
83-
}
78+
var tagBeta = new Tag {Component1 = componentBeta, Name = "B17"};
79+
session.Save(tagBeta);
8480

85-
await (session.FlushAsync());
81+
transaction.Commit();
82+
}
83+
}
8684

87-
// query
88-
{
89-
ICriteria tagCriteria = session.CreateCriteria(typeof(Tag), "t");
90-
tagCriteria.CreateCriteria("Component1", "c1");
91-
tagCriteria.CreateCriteria("Component2", "c2", JoinType.LeftOuterJoin);
85+
protected override void OnTearDown()
86+
{
87+
using (var session = OpenSession())
88+
using (var transaction = session.BeginTransaction())
89+
{
90+
session.CreateQuery("delete from System.Object").ExecuteUpdate();
91+
transaction.Commit();
92+
}
93+
}
9294

93-
IProjection projectNameProjection;
94-
{
95-
// create correlated subquery
96-
var projectCriteria = DetachedCriteria.For(typeof(Project), "p");
95+
[Test]
96+
public async Task SubqueryCorrelatedThroughConditionalAsync()
97+
{
98+
using (var session = OpenSession())
99+
using (session.BeginTransaction())
100+
{
101+
var tagCriteria = session.CreateCriteria(typeof(Tag), "t");
102+
tagCriteria.CreateCriteria("Component1", "c1");
103+
tagCriteria.CreateCriteria("Component2", "c2", JoinType.LeftOuterJoin);
97104

98-
var conditionalCorrelationProjection = Projections.Conditional(
99-
Restrictions.IsNotNull(Projections.Property("t.Component2")),
100-
Projections.Property("c2.Project"),
101-
Projections.Property("c1.Project"));
102-
projectCriteria.Add(Restrictions.EqProperty("p.Id", conditionalCorrelationProjection));
105+
// create correlated subquery
106+
var projectCriteria = DetachedCriteria.For(typeof(Project), "p");
103107

104-
projectCriteria.SetProjection(Projections.Property("p.Name"));
108+
var conditionalCorrelationProjection = Projections.Conditional(
109+
Restrictions.IsNotNull(Projections.Property("t.Component2")),
110+
Projections.Property("c2.Project"),
111+
Projections.Property("c1.Project"));
112+
projectCriteria.Add(Restrictions.EqProperty("p.Id", conditionalCorrelationProjection));
105113

106-
projectNameProjection = Projections.SubQuery(projectCriteria);
107-
}
114+
projectCriteria.SetProjection(Projections.Property("p.Name"));
108115

109-
tagCriteria.Add(Restrictions.Eq(projectNameProjection, "Beta"));
110-
tagCriteria.SetProjection(Projections.Property("t.Name"));
116+
var projectNameProjection = Projections.SubQuery(projectCriteria);
111117

112-
// run query
118+
tagCriteria.Add(Restrictions.Eq(projectNameProjection, "Beta"));
119+
tagCriteria.SetProjection(Projections.Property("t.Name"));
113120

114-
var results = await (tagCriteria.ListAsync());
121+
// run query
122+
var results = await (tagCriteria.ListAsync());
115123

116-
Assert.That(results, Is.EquivalentTo(new[] { "B17" }));
117-
}
124+
Assert.That(results, Is.EquivalentTo(new[] {"B17"}));
118125
}
119126
}
120127
}

‎src/NHibernate.Test/NHSpecificTest/GH2454/FixtureByCode.cs

Lines changed: 50 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -42,68 +42,75 @@ protected override HbmMapping GetMappings()
4242
return mapper.CompileMappingForAllExplicitlyAddedEntities();
4343
}
4444

45-
[Test]
46-
public void SubqueryCorrelatedThroughConditional()
45+
protected override void OnSetUp()
4746
{
4847
using (var session = OpenSession())
4948
using (var transaction = session.BeginTransaction())
5049
{
51-
// data
52-
{
53-
// alpha entities
54-
var projectAlpha = new Project { Name = "Alpha" };
55-
session.Save(projectAlpha);
50+
// alpha entities
51+
var projectAlpha = new Project {Name = "Alpha"};
52+
session.Save(projectAlpha);
5653

57-
var componentAlpha = new Component { Project = projectAlpha, Name = "Thingie" };
58-
session.Save(componentAlpha);
54+
var componentAlpha = new Component {Project = projectAlpha, Name = "Thingie"};
55+
session.Save(componentAlpha);
5956

60-
var tagAlpha = new Tag { Component1 = componentAlpha, Name = "A20" };
61-
session.Save(tagAlpha);
57+
var tagAlpha = new Tag {Component1 = componentAlpha, Name = "A20"};
58+
session.Save(tagAlpha);
6259

63-
// beta entities
64-
var projectBeta = new Project { Name = "Beta" };
65-
session.Save(projectBeta);
60+
// beta entities
61+
var projectBeta = new Project {Name = "Beta"};
62+
session.Save(projectBeta);
6663

67-
var componentBeta = new Component { Project = projectBeta, Name = "Thingie" };
68-
session.Save(componentBeta);
64+
var componentBeta = new Component {Project = projectBeta, Name = "Thingie"};
65+
session.Save(componentBeta);
6966

70-
var tagBeta = new Tag { Component1 = componentBeta, Name = "B17" };
71-
session.Save(tagBeta);
72-
}
67+
var tagBeta = new Tag {Component1 = componentBeta, Name = "B17"};
68+
session.Save(tagBeta);
7369

74-
session.Flush();
70+
transaction.Commit();
71+
}
72+
}
7573

76-
// query
77-
{
78-
ICriteria tagCriteria = session.CreateCriteria(typeof(Tag), "t");
79-
tagCriteria.CreateCriteria("Component1", "c1");
80-
tagCriteria.CreateCriteria("Component2", "c2", JoinType.LeftOuterJoin);
74+
protected override void OnTearDown()
75+
{
76+
using (var session = OpenSession())
77+
using (var transaction = session.BeginTransaction())
78+
{
79+
session.CreateQuery("delete from System.Object").ExecuteUpdate();
80+
transaction.Commit();
81+
}
82+
}
8183

82-
IProjection projectNameProjection;
83-
{
84-
// create correlated subquery
85-
var projectCriteria = DetachedCriteria.For(typeof(Project), "p");
84+
[Test]
85+
public void SubqueryCorrelatedThroughConditional()
86+
{
87+
using (var session = OpenSession())
88+
using (session.BeginTransaction())
89+
{
90+
var tagCriteria = session.CreateCriteria(typeof(Tag), "t");
91+
tagCriteria.CreateCriteria("Component1", "c1");
92+
tagCriteria.CreateCriteria("Component2", "c2", JoinType.LeftOuterJoin);
8693

87-
var conditionalCorrelationProjection = Projections.Conditional(
88-
Restrictions.IsNotNull(Projections.Property("t.Component2")),
89-
Projections.Property("c2.Project"),
90-
Projections.Property("c1.Project"));
91-
projectCriteria.Add(Restrictions.EqProperty("p.Id", conditionalCorrelationProjection));
94+
// create correlated subquery
95+
var projectCriteria = DetachedCriteria.For(typeof(Project), "p");
9296

93-
projectCriteria.SetProjection(Projections.Property("p.Name"));
97+
var conditionalCorrelationProjection = Projections.Conditional(
98+
Restrictions.IsNotNull(Projections.Property("t.Component2")),
99+
Projections.Property("c2.Project"),
100+
Projections.Property("c1.Project"));
101+
projectCriteria.Add(Restrictions.EqProperty("p.Id", conditionalCorrelationProjection));
94102

95-
projectNameProjection = Projections.SubQuery(projectCriteria);
96-
}
103+
projectCriteria.SetProjection(Projections.Property("p.Name"));
97104

98-
tagCriteria.Add(Restrictions.Eq(projectNameProjection, "Beta"));
99-
tagCriteria.SetProjection(Projections.Property("t.Name"));
105+
var projectNameProjection = Projections.SubQuery(projectCriteria);
100106

101-
// run query
107+
tagCriteria.Add(Restrictions.Eq(projectNameProjection, "Beta"));
108+
tagCriteria.SetProjection(Projections.Property("t.Name"));
102109

103-
var results = tagCriteria.List();
110+
// run query
111+
var results = tagCriteria.List();
104112

105-
Assert.That(results, Is.EquivalentTo(new[] { "B17" }));
106-
}
113+
Assert.That(results, Is.EquivalentTo(new[] {"B17"}));
107114
}
108115
}
109116
}

0 commit comments

Comments
 (0)