Change to "no global domain" approach

Author: alex-kulakov

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

@@ -23,7 +23,7 @@ public class UpgradeTest
     [SetUp]
     public void SetUp()
     {
-      BuildDomain("1", DomainUpgradeMode.Recreate);
+      using (var domain = BuildDomain("1", DomainUpgradeMode.Recreate))
       using (var session = domain.OpenSession()) {
         using (var tx = session.OpenTransaction()) {
           var toRemove1 = new M1.EntityToRemove1();
@@ -41,7 +41,7 @@ public void SetUp()
     [IgnoreIfGithubActions(StorageProvider.Firebird)]
     public void UpgradeToVersion2Test()
     {
-      BuildDomain("2", DomainUpgradeMode.PerformSafely);
+      using (var domain = BuildDomain("2", DomainUpgradeMode.PerformSafely))
       using (var session = domain.OpenSession()) {
         using (var tx = session.OpenTransaction()) {
           var toKeep1 = session.Query.All<M2.EntityToKeep1>().Single();
@@ -51,13 +51,10 @@ public void UpgradeToVersion2Test()
       }
     }
 
-    private void BuildDomain(string version, DomainUpgradeMode upgradeMode)
+    private Domain BuildDomain(string version, DomainUpgradeMode upgradeMode)
     {
-      if (domain != null)
-        domain.DisposeSafely();
-
-      string ns = typeof(M1.EntityToKeep1).Namespace;
-      string nsPrefix = ns.Substring(0, ns.Length - 1);
+      var ns = typeof(M1.EntityToKeep1).Namespace;
+      var nsPrefix = ns.Substring(0, ns.Length - 1);
 
       var configuration = DomainConfigurationFactory.Create();
       configuration.UpgradeMode = upgradeMode;
@@ -66,7 +63,7 @@ private void BuildDomain(string version, DomainUpgradeMode upgradeMode)
       configuration.Types.Register(typeof(Upgrader));
 
       using (Upgrader.Enable(version)) {
-        domain = Domain.Build(configuration);
+        return Domain.Build(configuration);
       }
     }
   }

Orm/Xtensive.Orm.Tests/Upgrade/EntitySetUpgrade/UpgradeTest.cs

@@ -7,23 +7,19 @@
 using System;
 using System.Linq;
 using System.Reflection;
-using Xtensive.Core;
-using Xtensive.Orm.Tests.Upgrade.EntitySetUpgradeTest.Model.Version1;
+using NUnit.Framework;
 using M1 = Xtensive.Orm.Tests.Upgrade.EntitySetUpgradeTest.Model.Version1;
 using M2 = Xtensive.Orm.Tests.Upgrade.EntitySetUpgradeTest.Model.Version2;
-using NUnit.Framework;
 
 namespace Xtensive.Orm.Tests.Upgrade.EntitySetUpgradeTest
 {
   [TestFixture]
   public class UpgradeTest
   {
-    private Domain domain;
-
     [SetUp]
     public void SetUp()
     {
-      BuildDomain("1", DomainUpgradeMode.Recreate);
+      using (BuildDomain("1", DomainUpgradeMode.Recreate))
       using (var session = domain.OpenSession()) {
         using (var tx = session.OpenTransaction()) {
           var person = new M1.Person();
@@ -40,29 +36,26 @@ public void SetUp()
     [IgnoreOnGithubActionsIfFailed(StorageProvider.Firebird)]
     public void UpgradeToVersion2Test()
     {
-      BuildDomain("2", DomainUpgradeMode.Perform);
+      using (BuildDomain("2", DomainUpgradeMode.Perform))
       using (var session = domain.OpenSession()) {
         using (session.OpenTransaction()) {
           Assert.AreEqual(1, session.Query.All<M2.Person>().Count());
         }
       }
     }
 
-    private void BuildDomain(string version, DomainUpgradeMode upgradeMode)
+    private Domain BuildDomain(string version, DomainUpgradeMode upgradeMode)
     {
-      if (domain != null)
-        domain.DisposeSafely();
-
-      string ns = typeof(Person).Namespace;
-      string nsPrefix = ns.Substring(0, ns.Length - 1);
+      var ns = typeof(M1.Person).Namespace;
+      var nsPrefix = ns.Substring(0, ns.Length - 1);
 
       var configuration = DomainConfigurationFactory.Create();
       configuration.UpgradeMode = upgradeMode;
       configuration.Types.Register(Assembly.GetExecutingAssembly(), nsPrefix + version);
       configuration.Types.Register(typeof(Upgrader));
 
       using (Upgrader.Enable(version)) {
-        domain = Domain.Build(configuration);
+        return Domain.Build(configuration);
       }
     }
   }