Skip to content

Commit bef0b53

Browse files
alex-kulakovalex-kulakov
committed
Offtop: avoid tests to have domain instance as field
1 parent fc258e4 commit bef0b53

17 files changed

Lines changed: 414 additions & 541 deletions

File tree

‎Orm/Xtensive.Orm.Tests/Issues/IssueJira0180_ChangeNullabilityViaUpgradeHints/UpgradeTest.cs‎

Lines changed: 26 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -19,64 +19,46 @@ namespace Xtensive.Orm.Tests.Issues.IssueJira0180_ChangeNullabilityViaUpgradeHin
1919
[TestFixture]
2020
public class UpgradeTest
2121
{
22-
private Domain domain;
23-
2422
[Test]
25-
public void NoneTest()
26-
{
27-
RunTest(NamingRules.None);
28-
}
23+
public void NoneTest() => RunTest(NamingRules.None);
2924

3025
[Test]
31-
public void UnderscoreDotsTest()
32-
{
33-
RunTest(NamingRules.UnderscoreDots);
34-
}
26+
public void UnderscoreDotsTest() => RunTest(NamingRules.UnderscoreDots);
3527

3628
[Test]
37-
public void UnderscoreHyphensTest()
38-
{
39-
RunTest(NamingRules.UnderscoreHyphens);
40-
}
29+
public void UnderscoreHyphensTest() => RunTest(NamingRules.UnderscoreHyphens);
4130

4231
[Test]
43-
public void UnderscoreDotsAndHyphensTest()
44-
{
45-
RunTest(NamingRules.UnderscoreDots | NamingRules.UnderscoreHyphens);
46-
}
32+
public void UnderscoreDotsAndHyphensTest() => RunTest(NamingRules.UnderscoreDots | NamingRules.UnderscoreHyphens);
4733

4834
private void RunTest(NamingRules namingRules)
4935
{
50-
BuildDomain("1", DomainUpgradeMode.Recreate, namingRules);
51-
using (var session = domain.OpenSession()) {
52-
using (var tx = session.OpenTransaction()) {
53-
var person = new M1.Person {
54-
Name = "Vasya",
55-
Weight = 80,
56-
Age = 20,
57-
Phone = new M1.Phone(),
58-
};
59-
tx.Complete();
60-
}
36+
using (var domain = BuildDomain("1", DomainUpgradeMode.Recreate, namingRules))
37+
using (var session = domain.OpenSession())
38+
using (var tx = session.OpenTransaction()) {
39+
var person = new M1.Person {
40+
Name = "Vasya",
41+
Weight = 80,
42+
Age = 20,
43+
Phone = new M1.Phone(),
44+
};
45+
tx.Complete();
6146
}
62-
BuildDomain("2", DomainUpgradeMode.PerformSafely, namingRules);
63-
using (var session = domain.OpenSession()) {
64-
using (var tx = session.OpenTransaction()) {
65-
var vasya = session.Query.All<Model.Version2.Person>().Single();
66-
Assert.AreEqual("Vasya", vasya.Name);
67-
Assert.AreEqual(80, vasya.Weight);
68-
Assert.IsNotNull(vasya.Phone);
69-
}
47+
48+
using (var domain = BuildDomain("2", DomainUpgradeMode.PerformSafely, namingRules))
49+
using (var session = domain.OpenSession())
50+
using (var tx = session.OpenTransaction()) {
51+
var vasya = session.Query.All<Model.Version2.Person>().Single();
52+
Assert.AreEqual("Vasya", vasya.Name);
53+
Assert.AreEqual(80, vasya.Weight);
54+
Assert.IsNotNull(vasya.Phone);
7055
}
7156
}
7257

73-
private void BuildDomain(string version, DomainUpgradeMode upgradeMode, NamingRules namingRules)
58+
private Domain BuildDomain(string version, DomainUpgradeMode upgradeMode, NamingRules namingRules)
7459
{
75-
if (domain != null)
76-
domain.DisposeSafely();
77-
78-
string ns = typeof(M1.Person).Namespace;
79-
string nsPrefix = ns.Substring(0, ns.Length - 1);
60+
var ns = typeof(M1.Person).Namespace;
61+
var nsPrefix = ns.Substring(0, ns.Length - 1);
8062

8163
var configuration = DomainConfigurationFactory.Create();
8264
configuration.UpgradeMode = upgradeMode;
@@ -85,7 +67,7 @@ private void BuildDomain(string version, DomainUpgradeMode upgradeMode, NamingRu
8567
configuration.NamingConvention.NamingRules = namingRules;
8668

8769
using (Upgrader.Enable(version)) {
88-
domain = Domain.Build(configuration);
70+
return Domain.Build(configuration);
8971
}
9072
}
9173
}

‎Orm/Xtensive.Orm.Tests/Issues/IssueJira0208_IncorrectUpgradeSequence/UpgradeTest.cs‎

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,45 +18,38 @@ namespace Xtensive.Orm.Tests.Issues.IssueJira0208_IncorrectUpgradeSequence
1818
[TestFixture]
1919
public class UpgradeTest
2020
{
21-
private Domain domain;
22-
2321
[SetUp]
2422
public void SetUp()
2523
{
26-
BuildDomain("1", DomainUpgradeMode.Recreate);
27-
using (var session = domain.OpenSession()) {
28-
using (var tx = session.OpenTransaction()) {
29-
var toRemove1 = new M1.EntityToRemove1();
30-
var toKeep1 = new M1.EntityToKeep1(toRemove1);
31-
var toRemove2 = new M1.EntityToRemove2();
32-
var toKeep2 = new M1.EntityToKeep2(toRemove2);
33-
new M1.VeryUniqueEntity();
34-
new M1.VeryUniqueEntity();
35-
tx.Complete();
36-
}
24+
using (var domain = BuildDomain("1", DomainUpgradeMode.Recreate))
25+
using (var session = domain.OpenSession())
26+
using (var tx = session.OpenTransaction()) {
27+
var toRemove1 = new M1.EntityToRemove1();
28+
var toKeep1 = new M1.EntityToKeep1(toRemove1);
29+
var toRemove2 = new M1.EntityToRemove2();
30+
var toKeep2 = new M1.EntityToKeep2(toRemove2);
31+
_ = new M1.VeryUniqueEntity();
32+
_ = new M1.VeryUniqueEntity();
33+
tx.Complete();
3734
}
3835
}
3936

4037
[Test]
4138
public void UpgradeToVersion2Test()
4239
{
43-
BuildDomain("2", DomainUpgradeMode.PerformSafely);
44-
using (var session = domain.OpenSession()) {
45-
using (var tx = session.OpenTransaction()) {
46-
var toKeep1 = session.Query.All<M2.EntityToKeep1>().Single();
47-
var toKeep2 = session.Query.All<M2.EntityToKeep2>().Single();
48-
Assert.AreEqual(2, session.Query.All<M2.VeryUniqueEntity>().Count());
49-
}
40+
using (var domain = BuildDomain("2", DomainUpgradeMode.PerformSafely))
41+
using (var session = domain.OpenSession())
42+
using (var tx = session.OpenTransaction()) {
43+
var toKeep1 = session.Query.All<M2.EntityToKeep1>().Single();
44+
var toKeep2 = session.Query.All<M2.EntityToKeep2>().Single();
45+
Assert.AreEqual(2, session.Query.All<M2.VeryUniqueEntity>().Count());
5046
}
5147
}
5248

53-
private void BuildDomain(string version, DomainUpgradeMode upgradeMode)
49+
private Domain BuildDomain(string version, DomainUpgradeMode upgradeMode)
5450
{
55-
if (domain != null)
56-
domain.DisposeSafely();
57-
58-
string ns = typeof(M1.EntityToKeep1).Namespace;
59-
string nsPrefix = ns.Substring(0, ns.Length - 1);
51+
var ns = typeof(M1.EntityToKeep1).Namespace;
52+
var nsPrefix = ns.Substring(0, ns.Length - 1);
6053

6154
var configuration = DomainConfigurationFactory.Create();
6255
configuration.UpgradeMode = upgradeMode;
@@ -65,7 +58,7 @@ private void BuildDomain(string version, DomainUpgradeMode upgradeMode)
6558
configuration.Types.Register(typeof(Upgrader));
6659

6760
using (Upgrader.Enable(version)) {
68-
domain = Domain.Build(configuration);
61+
return Domain.Build(configuration);
6962
}
7063
}
7164
}

‎Orm/Xtensive.Orm.Tests/Issues/Issue_0694_SchemaUpgradeBug/UpgradeTest.cs‎

Lines changed: 42 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -22,88 +22,79 @@ namespace Xtensive.Orm.Tests.Issues.Issue_0694_SchemaUpgradeBug
2222
[TestFixture]
2323
public class UpgradeTest
2424
{
25-
private Domain domain;
26-
2725
[SetUp]
2826
public void SetUp()
2927
{
30-
BuildDomain("1", DomainUpgradeMode.Recreate);
31-
using (var session = domain.OpenSession()) {
32-
using (var tx = session.OpenTransaction()) {
33-
var status = new Status() {Title = "Status"};
34-
var media = new Media() {Title = "Media", Data = "Data"};
35-
media.Statuses.Add(status);
36-
tx.Complete();
37-
}
28+
using (var domain = BuildDomain("1", DomainUpgradeMode.Recreate))
29+
using (var session = domain.OpenSession())
30+
using (var tx = session.OpenTransaction()) {
31+
var status = new Status() { Title = "Status" };
32+
var media = new Media() { Title = "Media", Data = "Data" };
33+
_ = media.Statuses.Add(status);
34+
tx.Complete();
3835
}
3936
}
4037

4138
[Test]
4239
public void UpgradeToVersion2Test()
4340
{
44-
BuildDomain("2", DomainUpgradeMode.Perform);
41+
using (var domain = BuildDomain("2", DomainUpgradeMode.Perform))
4542
using (var session = domain.OpenSession())
46-
{
47-
using (session.OpenTransaction())
48-
{
49-
var status = session.Query.All<Model.Version2.Status>().SingleOrDefault();
50-
var newMedia = session.Query.All<NewMedia>().SingleOrDefault();
51-
var newMediaTricky = session.Query.All<Content>().Where(c => c.Title == "Media").SingleOrDefault();
43+
using (session.OpenTransaction()) {
44+
var status = session.Query.All<Model.Version2.Status>().SingleOrDefault();
45+
var newMedia = session.Query.All<NewMedia>().SingleOrDefault();
46+
var newMediaTricky = session.Query.All<Content>().Where(c => c.Title == "Media").SingleOrDefault();
5247

53-
int statusCount = session.Query.All<Model.Version2.Status>().Count();
54-
int statusAssociationCount = status != null ? status.AssociatedContent.Count() : 0;
55-
int newMediaCount = session.Query.All<NewMedia>().Count();
48+
var statusCount = session.Query.All<Model.Version2.Status>().Count();
49+
var statusAssociationCount = status != null ? status.AssociatedContent.Count() : 0;
50+
var newMediaCount = session.Query.All<NewMedia>().Count();
5651

57-
Assert.IsNotNull(status);
58-
Assert.IsNull(newMedia);
59-
Assert.IsNull(newMediaTricky);
60-
Assert.AreEqual(1, statusCount);
61-
Assert.AreEqual(0, newMediaCount);
62-
Assert.AreEqual(0, statusAssociationCount);
63-
}
52+
Assert.IsNotNull(status);
53+
Assert.IsNull(newMedia);
54+
Assert.IsNull(newMediaTricky);
55+
Assert.AreEqual(1, statusCount);
56+
Assert.AreEqual(0, newMediaCount);
57+
Assert.AreEqual(0, statusAssociationCount);
6458
}
6559
}
6660

6761
[Test, Ignore("Default behavior changed. Namespace-only renames are tracked automatically.")]
6862
public void UpgradeToVersion3Test()
6963
{
70-
BuildDomain("3", DomainUpgradeMode.Perform);
71-
using (var session = domain.OpenSession()) {
72-
using (session.OpenTransaction()) {
73-
// No version-to-version hints, so all the types are removed
74-
var status = session.Query.All<Model.Version3.Status>().FirstOrDefault();
75-
var newMedia = session.Query.All<Model.Version3.NewMedia>().FirstOrDefault();
76-
var newMediaTricky = session.Query.All<Model.Version3.Content>().FirstOrDefault();
64+
using (var domain = BuildDomain("3", DomainUpgradeMode.Perform))
65+
using (var session = domain.OpenSession())
66+
using (session.OpenTransaction()) {
67+
// No version-to-version hints, so all the types are removed
68+
var status = session.Query.All<Model.Version3.Status>().FirstOrDefault();
69+
var newMedia = session.Query.All<Model.Version3.NewMedia>().FirstOrDefault();
70+
var newMediaTricky = session.Query.All<Model.Version3.Content>().FirstOrDefault();
7771

78-
int statusCount = session.Query.All<Model.Version3.Status>().Count();
79-
int statusAssociationCount = status!=null ? status.AssociatedContent.Count() : 0;
80-
int newMediaCount = session.Query.All<Model.Version3.NewMedia>().Count();
72+
var statusCount = session.Query.All<Model.Version3.Status>().Count();
73+
var statusAssociationCount = status != null ? status.AssociatedContent.Count() : 0;
74+
var newMediaCount = session.Query.All<Model.Version3.NewMedia>().Count();
8175

82-
Assert.IsNull(status);
83-
Assert.IsNull(newMedia);
84-
Assert.IsNull(newMediaTricky);
85-
Assert.AreEqual(0, statusCount);
86-
Assert.AreEqual(0, newMediaCount);
87-
Assert.AreEqual(0, statusAssociationCount);
88-
}
76+
Assert.IsNull(status);
77+
Assert.IsNull(newMedia);
78+
Assert.IsNull(newMediaTricky);
79+
Assert.AreEqual(0, statusCount);
80+
Assert.AreEqual(0, newMediaCount);
81+
Assert.AreEqual(0, statusAssociationCount);
8982
}
9083
}
9184

92-
private void BuildDomain(string version, DomainUpgradeMode upgradeMode)
85+
private Domain BuildDomain(string version, DomainUpgradeMode upgradeMode)
9386
{
94-
if (domain != null)
95-
domain.DisposeSafely();
96-
97-
string ns = typeof(Model.Version1.Content).Namespace;
98-
string nsPrefix = ns.Substring(0, ns.Length - 1);
87+
var ns = typeof(Model.Version1.Content).Namespace;
88+
var nsPrefix = ns.Substring(0, ns.Length - 1);
9989

10090
var configuration = DomainConfigurationFactory.Create();
10191
configuration.UpgradeMode = upgradeMode;
92+
configuration.BuildInParallel = false;
10293
configuration.Types.Register(Assembly.GetExecutingAssembly(), nsPrefix + version);
10394
configuration.Types.Register(typeof(Upgrader));
10495

10596
using (Upgrader.Enable(version)) {
106-
domain = Domain.Build(configuration);
97+
return Domain.Build(configuration);
10798
}
10899
}
109100
}

‎Orm/Xtensive.Orm.Tests/Issues/Issue_0716_UpgradeFailsInValidateMode/UpgradeTest.cs‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,52 +24,42 @@ namespace Xtensive.Orm.Tests.Issues.Issue_0716_UpgradeFailsInValidateMode
2424
// cases when cross-namespace movements appear.
2525
public class UpgradeTest
2626
{
27-
private Domain domain;
28-
2927
[OneTimeSetUp]
30-
public void TestSetUp()
31-
{
32-
Require.AllFeaturesSupported(ProviderFeatures.FullText);
33-
}
28+
public void TestSetUp() => Require.AllFeaturesSupported(ProviderFeatures.FullText);
3429

3530
[SetUp]
3631
public void SetUp()
3732
{
38-
BuildDomain("1", DomainUpgradeMode.Recreate);
39-
using (var session = domain.OpenSession()) {
40-
using (var tx = session.OpenTransaction()) {
41-
var acticle = new Article();
42-
tx.Complete();
43-
}
33+
using (var domain = BuildDomain("1", DomainUpgradeMode.Recreate))
34+
using (var session = domain.OpenSession())
35+
using (var tx = session.OpenTransaction()) {
36+
var acticle = new Article();
37+
tx.Complete();
4438
}
4539
}
4640

4741
[Test]
4842
public void UpgradeToVersion2Test()
4943
{
50-
BuildDomain("2", DomainUpgradeMode.Validate);
51-
using (var session = domain.OpenSession()) {
52-
using (session.OpenTransaction()) {
53-
Assert.AreEqual(1, session.Query.All<Model.Version2.Article>().Count());
54-
}
44+
using (var domain = BuildDomain("2", DomainUpgradeMode.Validate))
45+
using (var session = domain.OpenSession())
46+
using (session.OpenTransaction()) {
47+
Assert.AreEqual(1, session.Query.All<Model.Version2.Article>().Count());
5548
}
5649
}
5750

58-
private void BuildDomain(string version, DomainUpgradeMode upgradeMode)
51+
private Domain BuildDomain(string version, DomainUpgradeMode upgradeMode)
5952
{
60-
if (domain != null)
61-
domain.DisposeSafely();
62-
63-
string ns = typeof(Article).Namespace;
64-
string nsPrefix = ns.Substring(0, ns.Length - 1);
53+
var ns = typeof(Article).Namespace;
54+
var nsPrefix = ns.Substring(0, ns.Length - 1);
6555

6656
var configuration = DomainConfigurationFactory.Create();
6757
configuration.UpgradeMode = upgradeMode;
6858
configuration.Types.Register(Assembly.GetExecutingAssembly(), nsPrefix + version);
6959
configuration.Types.Register(typeof(Upgrader));
7060

7161
using (Upgrader.Enable(version)) {
72-
domain = Domain.Build(configuration);
62+
return Domain.Build(configuration);
7363
}
7464
}
7565
}

0 commit comments

Comments
 (0)