Skip to content

Commit a688cf7

Browse files
committed
IssueJira0615: fix some problems in test domain model
1 parent 545dfc3 commit a688cf7

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Orm/Xtensive.Orm.Tests/Issues/IssueJira0615_IncorrectComparisonWithLocalEntity.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,7 +1950,7 @@ public void EqualsByEntityMultiFieldKey01()
19501950
var results = Session.Query.All<PickingProductRequirement>()
19511951
.Select(
19521952
p => new {
1953-
V2 = (int) (p.Quantity.NormalizedValue * (p.MultyFieldKeyRef.Key == sharedEntity.Key ? margin : 1))
1953+
V2 = (int) (p.Quantity.NormalizedValue * (p.MultiFieldKeyRef.Key == sharedEntity.Key ? margin : 1))
19541954
})
19551955
.Where(t => t.V2 > 40)
19561956
.ToArray();
@@ -1968,7 +1968,7 @@ public void EqualsByEntityMultiFieldKey02()
19681968
var results = Session.Query.All<PickingProductRequirement>()
19691969
.Select(
19701970
p => new {
1971-
V2 = (int) (p.Quantity.NormalizedValue * (p.MultyFieldKeyRef.Key == sharedEntity.Key ? margin : 1))
1971+
V2 = (int) (p.Quantity.NormalizedValue * (p.MultiFieldKeyRef.Key == sharedEntity.Key ? margin : 1))
19721972
})
19731973
.OrderBy(t => t.V2)
19741974
.ToArray();
@@ -1987,7 +1987,7 @@ public void EqualsByEntityMultifieldKey03()
19871987
var results = Session.Query.All<PickingProductRequirement>()
19881988
.Select(
19891989
p => new {
1990-
V2 = (p.Quantity.NormalizedValue * (p.MultyFieldKeyRef.Key == sharedEntity.Key ? margin : 1))
1990+
V2 = (p.Quantity.NormalizedValue * (p.MultiFieldKeyRef.Key == sharedEntity.Key ? margin : 1))
19911991
})
19921992
.GroupBy(t => t.V2)
19931993
.ToArray();
@@ -2002,11 +2002,11 @@ public void EqualsByEntityMultiFieldKey04()
20022002

20032003
var margin = 2;
20042004
var results = Session.Query.All<PickingProductRequirement>()
2005-
.Where(p => (p.Quantity.NormalizedValue * (p.MultyFieldKeyRef.Key == sharedEntity.Key ? margin : 1)) > 40)
2005+
.Where(p => (p.Quantity.NormalizedValue * (p.MultiFieldKeyRef.Key == sharedEntity.Key ? margin : 1)) > 40)
20062006
.ToArray();
20072007

20082008
Assert.That(results.Length, Is.EqualTo(2));
2009-
Assert.That(results.All(a => a.MultyFieldKeyRef == sharedEntity), Is.True);
2009+
Assert.That(results.All(a => a.MultiFieldKeyRef == sharedEntity), Is.True);
20102010
}
20112011

20122012
[Test]
@@ -2016,12 +2016,12 @@ public void EqualsByEntityMultiFieldKey05()
20162016

20172017
var margin = 2;
20182018
var results = Session.Query.All<PickingProductRequirement>()
2019-
.OrderBy(p => p.Quantity.NormalizedValue * (p.MultyFieldKeyRef.Key == sharedEntity.Key ? margin : 1))
2019+
.OrderBy(p => p.Quantity.NormalizedValue * (p.MultiFieldKeyRef.Key == sharedEntity.Key ? margin : 1))
20202020
.ToArray();
20212021

20222022
Assert.That(results.Length, Is.EqualTo(4));
2023-
Assert.That(results.Take(2).Any(p => p.MultyFieldKeyRef == sharedEntity), Is.False);
2024-
Assert.That(results.Skip(2).All(p => p.MultyFieldKeyRef == sharedEntity), Is.True);
2023+
Assert.That(results.Take(2).Any(p => p.MultiFieldKeyRef == sharedEntity), Is.False);
2024+
Assert.That(results.Skip(2).All(p => p.MultiFieldKeyRef == sharedEntity), Is.True);
20252025
}
20262026

20272027
[Test]
@@ -2031,7 +2031,7 @@ public void EqualsByEntityMultifieldKey06()
20312031

20322032
var margin = 2;
20332033
var results = Session.Query.All<PickingProductRequirement>()
2034-
.GroupBy(p => p.Quantity.NormalizedValue * (p.MultyFieldKeyRef.Key == sharedEntity.Key ? margin : 1))
2034+
.GroupBy(p => p.Quantity.NormalizedValue * (p.MultiFieldKeyRef.Key == sharedEntity.Key ? margin : 1))
20352035
.ToArray();
20362036

20372037
Assert.That(results.Length, Is.EqualTo(4));
@@ -2048,7 +2048,7 @@ private static void CommandExecutingEventHandler(object sender, DbCommandEventAr
20482048

20492049
Console.Write(" Parameters: ");
20502050
for (int i = 0, count = parameters.Count; i < count; i++) {
2051-
var parameter = parameters[0];
2051+
var parameter = parameters[i];
20522052
Console.WriteLine($"{parameter.ParameterName} = {parameter.Value}");
20532053
}
20542054
}
@@ -2109,15 +2109,15 @@ public class PickingProductRequirement : MesObject
21092109
public bool? NullableBooleanFlag { get; set; }
21102110

21112111
[Field]
2112-
public MultiFieldKeyEntity MultyFieldKeyRef { get; set; }
2112+
public MultiFieldKeyEntity MultiFieldKeyRef { get; set; }
21132113

21142114
public PickingProductRequirement(Session session,
21152115
MultiFieldKeyEntity multiFieldKeyEntity, int id, bool boolFlag, bool? nullableBoolFlag)
21162116
: base(session, id)
21172117
{
21182118
BooleanFlag = boolFlag;
21192119
NullableBooleanFlag = nullableBoolFlag;
2120-
multiFieldKeyEntity = multiFieldKeyEntity;
2120+
MultiFieldKeyRef = multiFieldKeyEntity;
21212121
}
21222122
}
21232123

0 commit comments

Comments
 (0)