Move upgrade models to sub-namespace

alex-kulakov · alex-kulakov · commit 19c807372501 · 2025-06-10T11:14:13.000+05:00
diff --git a/Orm/Xtensive.Orm.Tests/Upgrade/DomainUpgradeTest.cs b/Orm/Xtensive.Orm.Tests/Upgrade/DomainUpgradeTest.cs
@@ -10,34 +10,34 @@
 using System.Reflection;
 
 using Xtensive.Core;
-using Xtensive.Orm.Tests.Upgrade.Model.Version1;
-using Xtensive.Orm.Tests.Upgrade.Model.Version2;
+using Xtensive.Orm.Tests.Upgrade.Models.Version1;
+using Xtensive.Orm.Tests.Upgrade.Models.Version2;
 using Xtensive.Orm.Providers;
 using Xtensive.Orm.Tests;
-using Address = Xtensive.Orm.Tests.Upgrade.Model.Version1.Address;
-using Boy = Xtensive.Orm.Tests.Upgrade.Model.Version2.Boy;
-using BusinessContact = Xtensive.Orm.Tests.Upgrade.Model.Version1.BusinessContact;
-using Employee = Xtensive.Orm.Tests.Upgrade.Model.Version1.Employee;
-using Entity1 = Xtensive.Orm.Tests.Upgrade.Model.Version2.Entity1;
-using Entity2 = Xtensive.Orm.Tests.Upgrade.Model.Version2.Entity2;
-using Entity3 = Xtensive.Orm.Tests.Upgrade.Model.Version2.Entity3;
-using Entity4 = Xtensive.Orm.Tests.Upgrade.Model.Version2.Entity4;
-using Girl = Xtensive.Orm.Tests.Upgrade.Model.Version2.Girl;
-using M1 = Xtensive.Orm.Tests.Upgrade.Model.Version1;
-using M2 = Xtensive.Orm.Tests.Upgrade.Model.Version2;
-using MyStructureOwner = Xtensive.Orm.Tests.Upgrade.Model.Version2.MyStructureOwner;
-using Order = Xtensive.Orm.Tests.Upgrade.Model.Version1.Order;
-using Person = Xtensive.Orm.Tests.Upgrade.Model.Version1.Person;
-using Product = Xtensive.Orm.Tests.Upgrade.Model.Version2.Product;
-using ReferencedEntity = Xtensive.Orm.Tests.Upgrade.Model.Version2.ReferencedEntity;
-using Structure1 = Xtensive.Orm.Tests.Upgrade.Model.Version1.Structure1;
-using Structure2 = Xtensive.Orm.Tests.Upgrade.Model.Version1.Structure2;
-using Structure3 = Xtensive.Orm.Tests.Upgrade.Model.Version1.Structure3;
-using Structure4 = Xtensive.Orm.Tests.Upgrade.Model.Version1.Structure4;
-using StructureContainer1 = Xtensive.Orm.Tests.Upgrade.Model.Version2.StructureContainer1;
-using StructureContainer2 = Xtensive.Orm.Tests.Upgrade.Model.Version2.StructureContainer2;
-using StructureContainer3 = Xtensive.Orm.Tests.Upgrade.Model.Version2.StructureContainer3;
-using StructureContainer4 = Xtensive.Orm.Tests.Upgrade.Model.Version2.StructureContainer4;
+using Address = Xtensive.Orm.Tests.Upgrade.Models.Version1.Address;
+using Boy = Xtensive.Orm.Tests.Upgrade.Models.Version2.Boy;
+using BusinessContact = Xtensive.Orm.Tests.Upgrade.Models.Version1.BusinessContact;
+using Employee = Xtensive.Orm.Tests.Upgrade.Models.Version1.Employee;
+using Entity1 = Xtensive.Orm.Tests.Upgrade.Models.Version2.Entity1;
+using Entity2 = Xtensive.Orm.Tests.Upgrade.Models.Version2.Entity2;
+using Entity3 = Xtensive.Orm.Tests.Upgrade.Models.Version2.Entity3;
+using Entity4 = Xtensive.Orm.Tests.Upgrade.Models.Version2.Entity4;
+using Girl = Xtensive.Orm.Tests.Upgrade.Models.Version2.Girl;
+using M1 = Xtensive.Orm.Tests.Upgrade.Models.Version1;
+using M2 = Xtensive.Orm.Tests.Upgrade.Models.Version2;
+using MyStructureOwner = Xtensive.Orm.Tests.Upgrade.Models.Version2.MyStructureOwner;
+using Order = Xtensive.Orm.Tests.Upgrade.Models.Version1.Order;
+using Person = Xtensive.Orm.Tests.Upgrade.Models.Version1.Person;
+using Product = Xtensive.Orm.Tests.Upgrade.Models.Version2.Product;
+using ReferencedEntity = Xtensive.Orm.Tests.Upgrade.Models.Version2.ReferencedEntity;
+using Structure1 = Xtensive.Orm.Tests.Upgrade.Models.Version1.Structure1;
+using Structure2 = Xtensive.Orm.Tests.Upgrade.Models.Version1.Structure2;
+using Structure3 = Xtensive.Orm.Tests.Upgrade.Models.Version1.Structure3;
+using Structure4 = Xtensive.Orm.Tests.Upgrade.Models.Version1.Structure4;
+using StructureContainer1 = Xtensive.Orm.Tests.Upgrade.Models.Version2.StructureContainer1;
+using StructureContainer2 = Xtensive.Orm.Tests.Upgrade.Models.Version2.StructureContainer2;
+using StructureContainer3 = Xtensive.Orm.Tests.Upgrade.Models.Version2.StructureContainer3;
+using StructureContainer4 = Xtensive.Orm.Tests.Upgrade.Models.Version2.StructureContainer4;
 
 namespace Xtensive.Orm.Tests.Upgrade
 {
@@ -236,17 +236,17 @@ public void UpgradeToVersion2Test()
       BuildDomain("2", DomainUpgradeMode.Perform);
       using (var session = domain.OpenSession())
       using (session.OpenTransaction()) {
-        Assert.AreEqual(2, session.Query.All<Model.Version2.Person>().Count());
-        Assert.AreEqual("Island Trading", session.Query.All<Model.Version2.Person>()
+        Assert.AreEqual(2, session.Query.All<Models.Version2.Person>().Count());
+        Assert.AreEqual("Island Trading", session.Query.All<Models.Version2.Person>()
           .First(person => person.ContactName == "Helen Bennett").CompanyName);
-        Assert.AreEqual(5, session.Query.All<Model.Version2.BusinessContact>().Count());
-        Assert.AreEqual("Suyama", session.Query.All<Model.Version2.BusinessContact>()
+        Assert.AreEqual(5, session.Query.All<Models.Version2.BusinessContact>().Count());
+        Assert.AreEqual("Suyama", session.Query.All<Models.Version2.BusinessContact>()
           .First(contact => contact.FirstName == "Michael").LastName);
-        Assert.AreEqual("Fuller", session.Query.All<Model.Version2.Employee>()
+        Assert.AreEqual("Fuller", session.Query.All<Models.Version2.Employee>()
           .First(employee => employee.FirstName == "Nancy").ReportsTo.LastName);
-        Assert.AreEqual(123, session.Query.All<Model.Version2.Person>()
+        Assert.AreEqual(123, session.Query.All<Models.Version2.Person>()
           .First(person => person.ContactName == "Helen Bennett").PassportNumber);
-        Assert.AreEqual(1, session.Query.All<Model.Version2.Order>()
+        Assert.AreEqual(1, session.Query.All<Models.Version2.Order>()
           .First(order => order.ProductName == "Maxilaku").Number);
 
         _ = session.Query.All<Product>().Single(product => product.Title == "DataObjects.NET");
@@ -322,8 +322,8 @@ private void BuildDomain(string version, DomainUpgradeMode upgradeMode)
       configuration.UpgradeMode = upgradeMode;
       configuration.Types.Register(Assembly.GetExecutingAssembly(),
         "Xtensive.Orm.Tests.Upgrade.Model.Version" + version);
-      configuration.Types.Register(typeof(Upgrader));
-      using (Upgrader.Enable(version)) {
+      configuration.Types.Register(typeof(Models.Upgrader));
+      using (Models.Upgrader.Enable(version)) {
         domain = Domain.Build(configuration);
       }
     }
@@ -344,8 +344,8 @@ private void BuildDomain(string version, DomainUpgradeMode upgradeMode, int? key
         configuration.KeyGeneratorCacheSize = keyCacheSize.Value;
       }
 
-      configuration.Types.Register(typeof (Upgrader));
-      using (Upgrader.Enable(version)) {
+      configuration.Types.Register(typeof (Models.Upgrader));
+      using (Models.Upgrader.Enable(version)) {
         domain = Domain.Build(configuration);
       }
     }
@@ -444,40 +444,40 @@ private void FillData()
         // Products & catgories
         _ = new Category {
           Name = "Web applications",
-          Products = { new Model.Version1.Product { Name = "HelpServer", IsActive = true } }
+          Products = { new Models.Version1.Product { Name = "HelpServer", IsActive = true } }
         };
 
         _ = new Category {
           Name = "Frameworks",
-          Products = { new Model.Version1.Product { Name = "DataObjects.NET", IsActive = true } }
+          Products = { new Models.Version1.Product { Name = "DataObjects.NET", IsActive = true } }
         };
 
         // Boys & girls
-        var alex = new Model.Version1.Boy("Alex");
-        var dmitry = new Model.Version1.Boy("Dmitry");
-        var elena = new Model.Version1.Girl("Elena");
-        var tanya = new Model.Version1.Girl("Tanya");
+        var alex = new Models.Version1.Boy("Alex");
+        var dmitry = new Models.Version1.Boy("Dmitry");
+        var elena = new Models.Version1.Girl("Elena");
+        var tanya = new Models.Version1.Girl("Tanya");
         _ = alex.FriendlyGirls.Add(elena);
         _ = alex.FriendlyGirls.Add(tanya);
         _ = elena.FriendlyBoys.Add(dmitry);
 
         // EntityX
-        var e1 = new Model.Version1.Entity1(1);
-        var e2 = new Model.Version1.Entity2(2, e1);
-        var e3 = new Model.Version1.Entity3(3, e2);
-        var e4 = new Model.Version1.Entity4(4, e3);
+        var e1 = new Models.Version1.Entity1(1);
+        var e2 = new Models.Version1.Entity2(2, e1);
+        var e3 = new Models.Version1.Entity3(3, e2);
+        var e4 = new Models.Version1.Entity4(4, e3);
 
         // StructureContainerX
-        var se1 = new Model.Version1.StructureContainer1 { S1 = new Structure1 { E1 = e1 } };
-        var se2 = new Model.Version1.StructureContainer2 { S2 = new Structure2 { E2 = e2, S1 = se1.S1 } };
-        var se3 = new Model.Version1.StructureContainer3 { S3 = new Structure3 { E3 = e3, S2 = se2.S2 } };
-        var se4 = new Model.Version1.StructureContainer4 { S4 = new Structure4 { E4 = e4, S3 = se3.S3 } };
+        var se1 = new Models.Version1.StructureContainer1 { S1 = new Structure1 { E1 = e1 } };
+        var se2 = new Models.Version1.StructureContainer2 { S2 = new Structure2 { E2 = e2, S1 = se1.S1 } };
+        var se3 = new Models.Version1.StructureContainer3 { S3 = new Structure3 { E3 = e3, S2 = se2.S2 } };
+        var se4 = new Models.Version1.StructureContainer4 { S4 = new Structure4 { E4 = e4, S3 = se3.S3 } };
 
         // MyStructureOwner, ReferencedEntity
-        _ = new Model.Version1.MyStructureOwner(0) { Structure = new MyStructure { A = 1, B = 2 } };
-        _ = new Model.Version1.MyStructureOwner(1) { Structure = new MyStructure { A = 2, B = 3 } };
-        _ = new Model.Version1.ReferencedEntity(1, 2);
-        _ = new Model.Version1.ReferencedEntity(2, 3);
+        _ = new Models.Version1.MyStructureOwner(0) { Structure = new MyStructure { A = 1, B = 2 } };
+        _ = new Models.Version1.MyStructureOwner(1) { Structure = new MyStructure { A = 2, B = 3 } };
+        _ = new Models.Version1.ReferencedEntity(1, 2);
+        _ = new Models.Version1.ReferencedEntity(2, 3);
 
         // Generic types
         _ = new Sync<M1.Person> { Root = helen };
diff --git a/Orm/Xtensive.Orm.Tests/Upgrade/Models/ModelVersion1.cs b/Orm/Xtensive.Orm.Tests/Upgrade/Models/ModelVersion1.cs
@@ -6,7 +6,7 @@
 
 using System;
 
-namespace Xtensive.Orm.Tests.Upgrade.Model.Version1
+namespace Xtensive.Orm.Tests.Upgrade.Models.Version1
 {
   #region Address, Person, BusinessContact, Employee
 
diff --git a/Orm/Xtensive.Orm.Tests/Upgrade/Models/ModelVersion2.cs b/Orm/Xtensive.Orm.Tests/Upgrade/Models/ModelVersion2.cs
@@ -7,7 +7,7 @@
 using System;
 using Xtensive.Orm.Model;
 
-namespace Xtensive.Orm.Tests.Upgrade.Model.Version2
+namespace Xtensive.Orm.Tests.Upgrade.Models.Version2
 {
   // BusinessContact renamed to Person
   // Person renamed to BusinessContact
diff --git a/Orm/Xtensive.Orm.Tests/Upgrade/Models/ModelVersion3.cs b/Orm/Xtensive.Orm.Tests/Upgrade/Models/ModelVersion3.cs
@@ -6,7 +6,7 @@
 
 using System;
 
-namespace Xtensive.Orm.Tests.Upgrade.Model.Version3
+namespace Xtensive.Orm.Tests.Upgrade.Models.Version3
 {
   // BusinessContact replaced with Contact
   // Order.Customer field type changed to Contact
diff --git a/Orm/Xtensive.Orm.Tests/Upgrade/Models/Upgrader.cs b/Orm/Xtensive.Orm.Tests/Upgrade/Models/Upgrader.cs
@@ -7,15 +7,10 @@
 using System;
 using System.Collections.Generic;
 using Xtensive.Core;
-using Xtensive.Collections;
-
-using Xtensive.Modelling.Comparison.Hints;
-using Xtensive.Orm.Tests.Upgrade.Model.Version2;
 using Xtensive.Orm.Upgrade;
-using M2 = Xtensive.Orm.Tests.Upgrade.Model.Version2;
-using M3 = Xtensive.Orm.Tests.Upgrade.Model.Version3;
+using Xtensive.Orm.Tests.Upgrade.Models.Version2;
 
-namespace Xtensive.Orm.Tests.Upgrade
+namespace Xtensive.Orm.Tests.Upgrade.Models
 {
   [Serializable]
   public class Upgrader : UpgradeHandler
@@ -167,14 +162,14 @@ private static IEnumerable<UpgradeHint> Version1To2Hints
       }
     }
 
-     private IEnumerable<UpgradeHint> Version1To3Hints
+    private IEnumerable<UpgradeHint> Version1To3Hints
     {
       get
       {
         yield return new RenameTypeHint(
-          "Xtensive.Orm.Tests.Upgrade.Model.Version1.Order", typeof (Model.Version3.Order));
+          "Xtensive.Orm.Tests.Upgrade.Model.Version1.Order", typeof (Models.Version3.Order));
         yield return new RenameTypeHint(
-          "Xtensive.Orm.Tests.Upgrade.Model.Version1.Person", typeof(Model.Version3.Person));
+          "Xtensive.Orm.Tests.Upgrade.Model.Version1.Person", typeof(Models.Version3.Person));
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`using System;`
`8`	`8`
`9`		`-namespace Xtensive.Orm.Tests.Upgrade.Model.Version1`
	`9`	`+namespace Xtensive.Orm.Tests.Upgrade.Models.Version1`
`10`	`10`	`{`
`11`	`11`	`#region Address, Person, BusinessContact, Employee`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using System;`
`8`	`8`	`using Xtensive.Orm.Model;`
`9`	`9`
`10`		`-namespace Xtensive.Orm.Tests.Upgrade.Model.Version2`
	`10`	`+namespace Xtensive.Orm.Tests.Upgrade.Models.Version2`
`11`	`11`	`{`
`12`	`12`	`// BusinessContact renamed to Person`
`13`	`13`	`// Person renamed to BusinessContact`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,10 @@`
`7`	`7`	`using System;`
`8`	`8`	`using System.Collections.Generic;`
`9`	`9`	`using Xtensive.Core;`
`10`		`-using Xtensive.Collections;`
`11`		`-`
`12`		`-using Xtensive.Modelling.Comparison.Hints;`
`13`		`-using Xtensive.Orm.Tests.Upgrade.Model.Version2;`
`14`	`10`	`using Xtensive.Orm.Upgrade;`
`15`		`-using M2 = Xtensive.Orm.Tests.Upgrade.Model.Version2;`
`16`		`-using M3 = Xtensive.Orm.Tests.Upgrade.Model.Version3;`
	`11`	`+using Xtensive.Orm.Tests.Upgrade.Models.Version2;`
`17`	`12`
`18`		`-namespace Xtensive.Orm.Tests.Upgrade`
	`13`	`+namespace Xtensive.Orm.Tests.Upgrade.Models`
`19`	`14`	`{`
`20`	`15`	`[Serializable]`
`21`	`16`	`public class Upgrader : UpgradeHandler`
`@@ -167,14 +162,14 @@ private static IEnumerable<UpgradeHint> Version1To2Hints`
`167`	`162`	`}`
`168`	`163`	`}`
`169`	`164`
`170`		`- private IEnumerable<UpgradeHint> Version1To3Hints`
	`165`	`+ private IEnumerable<UpgradeHint> Version1To3Hints`
`171`	`166`	`{`
`172`	`167`	`get`
`173`	`168`	`{`
`174`	`169`	`yield return new RenameTypeHint(`
`175`		`- "Xtensive.Orm.Tests.Upgrade.Model.Version1.Order", typeof (Model.Version3.Order));`
	`170`	`+ "Xtensive.Orm.Tests.Upgrade.Model.Version1.Order", typeof (Models.Version3.Order));`
`176`	`171`	`yield return new RenameTypeHint(`
`177`		`- "Xtensive.Orm.Tests.Upgrade.Model.Version1.Person", typeof(Model.Version3.Person));`
	`172`	`+ "Xtensive.Orm.Tests.Upgrade.Model.Version1.Person", typeof(Models.Version3.Person));`
`178`	`173`	`}`
`179`	`174`	`}`
`180`	`175`	`}`