Skip to content

Commit 650cc64

Browse files
alex-kulakovalex-kulakov
committed
Namespace update + ordinal string comparison
1 parent 2118cd9 commit 650cc64

11 files changed

+71
-71
lines changed

‎Orm/Xtensive.Orm.Tests/Upgrade/ConflictsByTable/ColumnTypeChangeInNewHierarchy.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
using Xtensive.Modelling.Actions;
1313
using Xtensive.Orm.Model;
1414
using Xtensive.Orm.Upgrade;
15-
using V1 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ColumnTypeChangeInNewHierarchyModel.Before;
16-
using V2 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ColumnTypeChangeInNewHierarchyModel.After;
17-
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ColumnTypeChangeInNewHierarchyModel.TestHelper;
15+
using V1 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ColumnTypeChangeInNewHierarchyModel.Before;
16+
using V2 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ColumnTypeChangeInNewHierarchyModel.After;
17+
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ColumnTypeChangeInNewHierarchyModel.TestHelper;
1818

19-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy
19+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable
2020
{
2121
[TestFixture]
2222
public sealed class ColumnTypeChangeInNewHierarchy : TestBase
@@ -146,7 +146,7 @@ protected override Type[] GetTypes(InheritanceSchema inheritanceSchema, bool isA
146146
}
147147
}
148148

149-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ColumnTypeChangeInNewHierarchyModel
149+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ColumnTypeChangeInNewHierarchyModel
150150
{
151151
public static class TestHelper
152152
{

‎Orm/Xtensive.Orm.Tests/Upgrade/ConflictsByTable/ComplexTest.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
using Xtensive.Modelling.Actions;
1111
using Xtensive.Orm.Configuration;
1212
using Xtensive.Orm.Model;
13-
using Modifiers = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ComplexTestModel.Modifiers;
14-
using Orig = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ComplexTestModel.Original;
15-
using Case1 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ComplexTestModel.Case1;
16-
using Case2 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ComplexTestModel.Case2;
17-
using Case3 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ComplexTestModel.Case3;
18-
using Case4 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ComplexTestModel.Case4;
19-
using Case5 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ComplexTestModel.Case5;
20-
using Case6 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ComplexTestModel.Case6;
21-
using Case7 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ComplexTestModel.Case7;
22-
using Case8 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ComplexTestModel.Case8;
23-
24-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy
13+
using Modifiers = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ComplexTestModel.Modifiers;
14+
using Orig = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ComplexTestModel.Original;
15+
using Case1 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ComplexTestModel.Case1;
16+
using Case2 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ComplexTestModel.Case2;
17+
using Case3 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ComplexTestModel.Case3;
18+
using Case4 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ComplexTestModel.Case4;
19+
using Case5 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ComplexTestModel.Case5;
20+
using Case6 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ComplexTestModel.Case6;
21+
using Case7 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ComplexTestModel.Case7;
22+
using Case8 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ComplexTestModel.Case8;
23+
24+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable
2525
{
2626
public class ComplexTest
2727
{

‎Orm/Xtensive.Orm.Tests/Upgrade/ConflictsByTable/ComplextTestModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using Xtensive.Orm.Building.Definitions;
1010
using Xtensive.Orm.Model;
1111

12-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ComplexTestModel
12+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ComplexTestModel
1313
{
1414
namespace Modifiers
1515
{

‎Orm/Xtensive.Orm.Tests/Upgrade/ConflictsByTable/ExactTableStructureNoGeneratorTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
using Xtensive.Orm.Configuration;
1414
using Xtensive.Orm.Model;
1515
using Xtensive.Orm.Upgrade;
16-
using V1 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ExactTableStructureNoGeneratorTestModel.Before;
17-
using V2 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ExactTableStructureNoGeneratorTestModel.After;
18-
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ExactTableStructureNoGeneratorTestModel.TestHelper;
16+
using V1 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ExactTableStructureNoGeneratorTestModel.Before;
17+
using V2 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ExactTableStructureNoGeneratorTestModel.After;
18+
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ExactTableStructureNoGeneratorTestModel.TestHelper;
1919

20-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy
20+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable
2121
{
2222
[TestFixture]
2323
public sealed class ExactTableStructureNoGeneratorTest : TestBase
@@ -127,7 +127,7 @@ protected override Type[] GetTypes(InheritanceSchema inheritanceSchema, bool isA
127127
}
128128
}
129129

130-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ExactTableStructureNoGeneratorTestModel
130+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ExactTableStructureNoGeneratorTestModel
131131
{
132132
public static class TestHelper
133133
{

‎Orm/Xtensive.Orm.Tests/Upgrade/ConflictsByTable/ExactTableStructureWithGeneratorTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
using Xtensive.Modelling.Actions;
1313
using Xtensive.Orm.Model;
1414
using Xtensive.Orm.Upgrade;
15-
using V1 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ExactTableStructureWithGeneratorTestModel.Before;
16-
using V2 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ExactTableStructureWithGeneratorTestModel.After;
17-
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ExactTableStructureWithGeneratorTestModel.TestHelper;
15+
using V1 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ExactTableStructureWithGeneratorTestModel.Before;
16+
using V2 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ExactTableStructureWithGeneratorTestModel.After;
17+
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ExactTableStructureWithGeneratorTestModel.TestHelper;
1818

1919

20-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy
20+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable
2121
{
2222
[TestFixture]
2323
public sealed class ExactTableStructureWithGeneratorTest : TestBase
@@ -126,7 +126,7 @@ protected override Type[] GetTypes(InheritanceSchema inheritanceSchema, bool isA
126126
}
127127
}
128128

129-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.ExactTableStructureWithGeneratorTestModel
129+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable.ExactTableStructureWithGeneratorTestModel
130130
{
131131
public static class TestHelper
132132
{

‎Orm/Xtensive.Orm.Tests/Upgrade/ConflictsByTable/NewColumnInNewHierarchyTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
using Xtensive.Modelling.Actions;
1313
using Xtensive.Orm.Model;
1414
using Xtensive.Orm.Upgrade;
15-
using V1 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.NewColumnInNewHierarchyTestModel.Before;
16-
using V2 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.NewColumnInNewHierarchyTestModel.After;
17-
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.NewColumnInNewHierarchyTestModel.TestHelper;
15+
using V1 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.NewColumnInNewHierarchyTestModel.Before;
16+
using V2 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.NewColumnInNewHierarchyTestModel.After;
17+
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.NewColumnInNewHierarchyTestModel.TestHelper;
1818

19-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy
19+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable
2020
{
2121
[TestFixture]
2222
public sealed class NewColumnInNewHierarchyTest : TestBase
@@ -129,7 +129,7 @@ protected override Type[] GetTypes(InheritanceSchema inheritanceSchema, bool isA
129129
}
130130
}
131131

132-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.NewColumnInNewHierarchyTestModel
132+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable.NewColumnInNewHierarchyTestModel
133133
{
134134
public static class TestHelper
135135
{

‎Orm/Xtensive.Orm.Tests/Upgrade/ConflictsByTable/PrimaryKeyNameChangedNoGeneratorTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
using Xtensive.Orm.Model;
1414
using Xtensive.Orm;
1515
using Xtensive.Orm.Upgrade;
16-
using V1 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.PrimaryKeyNameChangedNoGeneratorTestModel.Before;
17-
using V2 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.PrimaryKeyNameChangedNoGeneratorTestModel.After;
18-
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.PrimaryKeyNameChangedNoGeneratorTestModel.TestHelper;
16+
using V1 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.PrimaryKeyNameChangedNoGeneratorTestModel.Before;
17+
using V2 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.PrimaryKeyNameChangedNoGeneratorTestModel.After;
18+
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.PrimaryKeyNameChangedNoGeneratorTestModel.TestHelper;
1919

20-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy
20+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable
2121
{
2222
[TestFixture]
2323
public sealed class PrimaryKeyNameChangedNoGeneratorTest : TestBase
@@ -126,7 +126,7 @@ protected override Type[] GetTypes(InheritanceSchema inheritanceSchema, bool isA
126126
}
127127
}
128128

129-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.PrimaryKeyNameChangedNoGeneratorTestModel
129+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable.PrimaryKeyNameChangedNoGeneratorTestModel
130130
{
131131
public static class TestHelper
132132
{

‎Orm/Xtensive.Orm.Tests/Upgrade/ConflictsByTable/PrimaryKeyNameChangedWithGeneratorTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
using Xtensive.Orm;
1414
using Xtensive.Orm.Model;
1515
using Xtensive.Orm.Upgrade;
16-
using V1 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.PrimaryKeyNameChangedWithGeneratorTestModel.Before;
17-
using V2 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.PrimaryKeyNameChangedWithGeneratorTestModel.After;
18-
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.PrimaryKeyNameChangedWithGeneratorTestModel.TestHelper;
16+
using V1 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.PrimaryKeyNameChangedWithGeneratorTestModel.Before;
17+
using V2 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.PrimaryKeyNameChangedWithGeneratorTestModel.After;
18+
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.PrimaryKeyNameChangedWithGeneratorTestModel.TestHelper;
1919

20-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy
20+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable
2121
{
2222
[TestFixture]
2323
public sealed class PrimaryKeyNameChangedWithGeneratorTest : TestBase
@@ -126,7 +126,7 @@ protected override Type[] GetTypes(InheritanceSchema inheritanceSchema, bool isA
126126
}
127127
}
128128

129-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.PrimaryKeyNameChangedWithGeneratorTestModel
129+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable.PrimaryKeyNameChangedWithGeneratorTestModel
130130
{
131131
public static class TestHelper
132132
{

‎Orm/Xtensive.Orm.Tests/Upgrade/ConflictsByTable/RemovedColumnInNewHierarchyTest.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
using Xtensive.Modelling.Actions;
1313
using Xtensive.Orm.Model;
1414
using Xtensive.Orm.Upgrade;
15-
using V1 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.RemovedColumnInNewHierarchyTestModel.Before;
16-
using V2 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.RemovedColumnInNewHierarchyTestModel.After;
17-
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.RemovedColumnInNewHierarchyTestModel.TestHelper;
15+
using V1 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.RemovedColumnInNewHierarchyTestModel.Before;
16+
using V2 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.RemovedColumnInNewHierarchyTestModel.After;
17+
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.RemovedColumnInNewHierarchyTestModel.TestHelper;
1818

19-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy
19+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable
2020
{
2121
[TestFixture]
2222
public sealed class RemovedColumnInNewHierarchyTest : TestBase
@@ -30,8 +30,8 @@ protected override void CheckSingleTableComparisonResult(SchemaComparisonResult
3030
var structureActions = comparisonResult.UnsafeActions.OfType<RemoveNodeAction>().ToList(2);
3131
Assert.That(structureActions.Count, Is.EqualTo(2));
3232
Assert.That(structureActions
33-
.All(a => a.Path == $"Tables/SingleTableRoot/Columns/AboutToRemoveFieldRoot"
34-
|| a.Path == "Tables/SingleTableRoot/Columns/AboutToRemoveFieldLeaf"),
33+
.All(a => a.Path.Contains("Tables/SingleTableRoot/Columns/AboutToRemoveFieldRoot", StringComparison.OrdinalIgnoreCase)
34+
|| a.Path.Contains("Tables/SingleTableRoot/Columns/AboutToRemoveFieldLeaf", StringComparison.OrdinalIgnoreCase)),
3535
Is.True);
3636

3737
var dataActions = comparisonResult.UnsafeActions.OfType<DataAction>().ToList();
@@ -49,8 +49,8 @@ protected override void CheckClassTableComparisonResult(SchemaComparisonResult c
4949
var structureActions = comparisonResult.UnsafeActions.OfType<RemoveNodeAction>().ToList(2);
5050
Assert.That(structureActions.Count, Is.EqualTo(2));
5151
Assert.That(structureActions
52-
.All(a => a.Path == $"Tables/ClassTableRoot/Columns/AboutToRemoveFieldRoot"
53-
|| a.Path == "Tables/ClassTableLeaf/Columns/AboutToRemoveFieldLeaf"),
52+
.All(a => a.Path.Contains("Tables/ClassTableRoot/Columns/AboutToRemoveFieldRoot", StringComparison.OrdinalIgnoreCase)
53+
|| a.Path.Contains("Tables/ClassTableLeaf/Columns/AboutToRemoveFieldLeaf", StringComparison.OrdinalIgnoreCase)),
5454
Is.True);
5555

5656
var dataActions = comparisonResult.UnsafeActions.OfType<DataAction>().ToList();
@@ -69,9 +69,9 @@ protected override void CheckConcreteTableComparisonResult(SchemaComparisonResul
6969
var structureActions = comparisonResult.UnsafeActions.OfType<RemoveNodeAction>().ToList(2);
7070
Assert.That(structureActions.Count, Is.EqualTo(3));
7171
Assert.That(structureActions
72-
.All(a => a.Path == $"Tables/ConcreteTableRoot/Columns/AboutToRemoveFieldRoot"
73-
|| a.Path == "Tables/ConcreteTableLeaf/Columns/AboutToRemoveFieldRoot"
74-
|| a.Path == "Tables/ConcreteTableLeaf/Columns/AboutToRemoveFieldLeaf"),
72+
.All(a => a.Path.Contains("Tables/ConcreteTableRoot/Columns/AboutToRemoveFieldRoot", StringComparison.OrdinalIgnoreCase)
73+
|| a.Path.Contains("Tables/ConcreteTableLeaf/Columns/AboutToRemoveFieldRoot", StringComparison.OrdinalIgnoreCase)
74+
|| a.Path.Contains("Tables/ConcreteTableLeaf/Columns/AboutToRemoveFieldLeaf", StringComparison.OrdinalIgnoreCase)),
7575
Is.True);
7676

7777
var dataActions = comparisonResult.UnsafeActions.OfType<DataAction>().ToList();
@@ -147,7 +147,7 @@ protected override Type[] GetTypes(InheritanceSchema inheritanceSchema, bool isA
147147
}
148148
}
149149

150-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.RemovedColumnInNewHierarchyTestModel
150+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable.RemovedColumnInNewHierarchyTestModel
151151
{
152152
public static class TestHelper
153153
{

‎Orm/Xtensive.Orm.Tests/Upgrade/ConflictsByTable/RenamedColumnInNewHierarchyTest.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
using Xtensive.Modelling.Actions;
1313
using Xtensive.Orm.Model;
1414
using Xtensive.Orm.Upgrade;
15-
using V1 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.RenamedColumnInNewHierarchyTestModel.Before;
16-
using V2 = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.RenamedColumnInNewHierarchyTestModel.After;
17-
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.RenamedColumnInNewHierarchyTestModel.TestHelper;
15+
using V1 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.RenamedColumnInNewHierarchyTestModel.Before;
16+
using V2 = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.RenamedColumnInNewHierarchyTestModel.After;
17+
using TheTestHelper = Xtensive.Orm.Tests.Upgrade.ConflictsByTable.RenamedColumnInNewHierarchyTestModel.TestHelper;
1818

19-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy
19+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable
2020
{
2121
[TestFixture]
2222
public sealed class RenamedColumnInNewHierarchytest : TestBase
@@ -31,8 +31,8 @@ protected override void CheckSingleTableComparisonResult(SchemaComparisonResult
3131

3232
var removeActions = unsafeActions.OfType<RemoveNodeAction>().ToList(2);
3333
Assert.That(removeActions.Count, Is.EqualTo(2));
34-
Assert.That(removeActions.All(r => r.Path.Contains("SingleTableRoot/Columns/OldNameFieldRoot", StringComparison.Ordinal)
35-
|| r.Path.Contains("SingleTableRoot/Columns/OldNameFieldLeaf", StringComparison.Ordinal)),
34+
Assert.That(removeActions.All(r => r.Path.Contains("SingleTableRoot/Columns/OldNameFieldRoot", StringComparison.OrdinalIgnoreCase)
35+
|| r.Path.Contains("SingleTableRoot/Columns/OldNameFieldLeaf", StringComparison.OrdinalIgnoreCase)),
3636
Is.True);
3737

3838
var dataActions = unsafeActions.OfType<DataAction>().ToList(1);
@@ -51,8 +51,8 @@ protected override void CheckClassTableComparisonResult(SchemaComparisonResult c
5151

5252
var removeActions = unsafeActions.OfType<RemoveNodeAction>().ToList(2);
5353
Assert.That(removeActions.Count, Is.EqualTo(2));
54-
Assert.That(removeActions.All(r => r.Path.Contains("ClassTableRoot/Columns/OldNameFieldRoot", StringComparison.Ordinal)
55-
|| r.Path.Contains("ClassTableLeaf/Columns/OldNameFieldLeaf", StringComparison.Ordinal)),
54+
Assert.That(removeActions.All(r => r.Path.Contains("ClassTableRoot/Columns/OldNameFieldRoot", StringComparison.OrdinalIgnoreCase)
55+
|| r.Path.Contains("ClassTableLeaf/Columns/OldNameFieldLeaf", StringComparison.OrdinalIgnoreCase)),
5656
Is.True);
5757

5858
var dataActions = unsafeActions.OfType<DataAction>().ToList(3);
@@ -72,9 +72,9 @@ protected override void CheckConcreteTableComparisonResult(SchemaComparisonResul
7272

7373
var removeActions = unsafeActions.OfType<RemoveNodeAction>().ToList(3);
7474
Assert.That(removeActions.Count, Is.EqualTo(3));
75-
Assert.That(removeActions.All(r => r.Path.Contains("ConcreteTableRoot/Columns/OldNameFieldRoot", StringComparison.Ordinal)
76-
|| r.Path.Contains("ConcreteTableLeaf/Columns/OldNameFieldRoot", StringComparison.Ordinal)
77-
|| r.Path.Contains("ConcreteTableLeaf/Columns/OldNameFieldLeaf", StringComparison.Ordinal)),
75+
Assert.That(removeActions.All(r => r.Path.Contains("ConcreteTableRoot/Columns/OldNameFieldRoot", StringComparison.OrdinalIgnoreCase)
76+
|| r.Path.Contains("ConcreteTableLeaf/Columns/OldNameFieldRoot", StringComparison.OrdinalIgnoreCase)
77+
|| r.Path.Contains("ConcreteTableLeaf/Columns/OldNameFieldLeaf", StringComparison.OrdinalIgnoreCase)),
7878
Is.True);
7979

8080
var dataActions = unsafeActions.OfType<DataAction>().ToList();
@@ -150,7 +150,7 @@ protected override Type[] GetTypes(InheritanceSchema inheritanceSchema, bool isA
150150
}
151151
}
152152

153-
namespace Xtensive.Orm.Tests.Upgrade.TableMovesToAnotherHierarchy.RenamedColumnInNewHierarchyTestModel
153+
namespace Xtensive.Orm.Tests.Upgrade.ConflictsByTable.RenamedColumnInNewHierarchyTestModel
154154
{
155155
public static class TestHelper
156156
{

0 commit comments

Comments
 (0)