Correct Upgrader involved in tests + code improvements

Author: alex-kulakov

Orm/Xtensive.Orm.Tests/Upgrade/FullText/DomainUpgradeFullTextTest.cs

@@ -11,6 +11,7 @@
 using NUnit.Framework;
 
 using Xtensive.Core;
+using Xtensive.Orm.Configuration;
 using Xtensive.Orm.Providers;
 
 namespace Xtensive.Orm.Tests.Upgrade.FullText
@@ -45,26 +46,30 @@ public async Task UpgradeAsyncTest()
 
     private Domain BuildDomain(string version, DomainUpgradeMode upgradeMode)
     {
-      var configuration = DomainConfigurationFactory.Create();
-      configuration.UpgradeMode = upgradeMode;
-      configuration.Types.Register(Assembly.GetExecutingAssembly(),
-        "Xtensive.Orm.Tests.Upgrade.FullText.Model." + version);
-      using (Upgrader.Enable(version)) {
+      var configuration = BuildDomainConfiguration(version, upgradeMode);
+      using (Model.Upgrader.Enable(version)) {
         var domain = Domain.Build(configuration);
         return domain;
       }
     }
 
     private async Task<Domain> BuildDomainAsync(string version, DomainUpgradeMode upgradeMode)
+    {
+      var configuration = BuildDomainConfiguration(version, upgradeMode);
+      using (Model.Upgrader.Enable(version)) {
+        var domain = await Domain.BuildAsync(configuration);
+        return domain;
+      }
+    }
+
+    private DomainConfiguration BuildDomainConfiguration(string version, DomainUpgradeMode upgradeMode)
     {
       var configuration = DomainConfigurationFactory.Create();
       configuration.UpgradeMode = upgradeMode;
       configuration.Types.Register(Assembly.GetExecutingAssembly(),
         "Xtensive.Orm.Tests.Upgrade.FullText.Model." + version);
-      using (Upgrader.Enable(version)) {
-        var domain = await Domain.BuildAsync(configuration);
-        return domain;
-      }
+      configuration.Types.Register(typeof(Model.Upgrader));
+      return configuration;
     }
   }
 }