Skip to content

Commit ff20724

Browse files
gliljasgliljas
committed
Corrections in review
1 parent e63dca4 commit ff20724

21 files changed

+211
-51
lines changed

‎src/NHibernate.Test/Async/IdGen/Enhanced/Forcedtable/HiLoForcedTableSequenceTest.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ public async Task TestNormalBoundaryAsync()
5858
long expectedId = i + 1;
5959
Assert.That(entities[i].Id, Is.EqualTo(expectedId));
6060
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(1)); // initialization
61+
if (TenantIdentifier == null)
62+
{
63+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
64+
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
65+
Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
66+
}
6167
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
6268
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
6369
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
@@ -68,6 +74,12 @@ public async Task TestNormalBoundaryAsync()
6874
await (session.SaveAsync(entities[increment]));
6975
Assert.That(entities[optimizer.IncrementSize].Id, Is.EqualTo(optimizer.IncrementSize + 1));
7076
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization + clock-over
77+
if (TenantIdentifier == null)
78+
{
79+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(2)); // initialization + clock-over
80+
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
81+
Assert.That(optimizer.HiValue, Is.EqualTo(increment * 2 + 1));
82+
}
7183
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2)); // initialization + clock-over
7284
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
7385
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));

‎src/NHibernate.Test/Async/IdGen/Enhanced/Forcedtable/PooledForcedTableSequenceTest.cs‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ public async Task TestNormalBoundaryAsync()
5959
Assert.That(entities[i].Id, Is.EqualTo(expectedId));
6060
// NOTE : initialization calls table twice
6161
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization
62+
if (TenantIdentifier == null)
63+
{
64+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization
65+
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
66+
}
6267
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization
6368
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
6469
}
@@ -70,9 +75,15 @@ public async Task TestNormalBoundaryAsync()
7075
Assert.That(entities[optimizer.IncrementSize].Id, Is.EqualTo(optimizer.IncrementSize + 1));
7176
// initialization (2) + clock over
7277
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(3));
73-
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment*2 + 1));
78+
if (TenantIdentifier == null)
79+
{
80+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment * 2 + 1));
81+
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
82+
}
83+
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));
7484
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
7585

86+
7687
await (transaction.CommitAsync());
7788
}
7889

‎src/NHibernate.Test/Async/IdGen/Enhanced/Sequence/HiLoSequenceTest.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ public async Task TestNormalBoundaryAsync()
5656
entities[i] = new Entity("" + (i + 1));
5757
await (session.SaveAsync(entities[i]));
5858
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(1)); // initialization
59+
if (TenantIdentifier == null)
60+
{
61+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
62+
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
63+
Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
64+
}
5965
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
6066
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
6167
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
@@ -65,6 +71,12 @@ public async Task TestNormalBoundaryAsync()
6571
entities[increment] = new Entity("" + increment);
6672
await (session.SaveAsync(entities[increment]));
6773
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2));
74+
if (TenantIdentifier == null)
75+
{
76+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(2));
77+
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
78+
Assert.That(optimizer.HiValue, Is.EqualTo(increment * 2 + 1));
79+
}
6880
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2));
6981
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
7082
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));

‎src/NHibernate.Test/Async/IdGen/Enhanced/Sequence/PooledSequenceTest.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ public async Task TestNormalBoundaryAsync()
5555
entities[i] = new Entity("" + (i + 1));
5656
await (session.SaveAsync(entities[i]));
5757
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization calls seq twice
58+
if (TenantIdentifier == null)
59+
{
60+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization calls seq twice
61+
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
62+
}
5863
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization calls seq twice
5964
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
6065
}
@@ -63,6 +68,11 @@ public async Task TestNormalBoundaryAsync()
6368
entities[increment] = new Entity("" + increment);
6469
await (session.SaveAsync(entities[increment]));
6570
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(3)); // initialization (2) + clock over
71+
if (TenantIdentifier == null)
72+
{
73+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment * 2 + 1)); // initialization (2) + clock over
74+
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
75+
}
6676
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1)); // initialization (2) + clock over
6777
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
6878

‎src/NHibernate.Test/Async/IdGen/Enhanced/Table/HiLoTableTest.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ public async Task TestNormalBoundaryAsync()
5555
entities[i] = new Entity("" + (i + 1));
5656
await (s.SaveAsync(entities[i]));
5757
Assert.That(generator.TableAccessCount, Is.EqualTo(1)); // initialization
58+
if (TenantIdentifier == null)
59+
{
60+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
61+
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
62+
Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
63+
}
5864
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
5965
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
6066
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
@@ -64,6 +70,12 @@ public async Task TestNormalBoundaryAsync()
6470
entities[increment] = new Entity("" + increment);
6571
await (s.SaveAsync(entities[increment]));
6672
Assert.That(generator.TableAccessCount, Is.EqualTo(2));
73+
if (TenantIdentifier == null)
74+
{
75+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(2));
76+
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
77+
Assert.That(optimizer.HiValue, Is.EqualTo((increment * 2) + 1));
78+
}
6779
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2));
6880
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
6981
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo((increment * 2) + 1));

‎src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledLoTableTest.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ public async Task TestNormalBoundaryAsync()
5555
entities[i] = new Entity("" + (i + 1));
5656
await (s.SaveAsync(entities[i]));
5757
Assert.That(generator.TableAccessCount, Is.EqualTo(1)); // initialization
58+
if (TenantIdentifier == null)
59+
{
60+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
61+
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
62+
}
5863
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
5964
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
6065
}
@@ -63,6 +68,11 @@ public async Task TestNormalBoundaryAsync()
6368
entities[increment] = new Entity("" + increment);
6469
await (s.SaveAsync(entities[increment]));
6570
Assert.That(generator.TableAccessCount, Is.EqualTo(2));
71+
if (TenantIdentifier == null)
72+
{
73+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1));
74+
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
75+
}
6676
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1));
6777
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
6878

‎src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledTableTest.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@ public async Task TestNormalBoundaryAsync()
5454
entities[i] = new Entity("" + (i + 1));
5555
await (s.SaveAsync(entities[i]));
5656
Assert.That(generator.TableAccessCount, Is.EqualTo(2)); // initialization calls seq twice
57+
if (TenantIdentifier == null)
58+
{
59+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization calls seq twice
60+
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
61+
}
5762
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization calls seq twice
5863
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
5964
}
@@ -62,6 +67,11 @@ public async Task TestNormalBoundaryAsync()
6267
entities[increment] = new Entity("" + increment);
6368
await (s.SaveAsync(entities[increment]));
6469
Assert.That(generator.TableAccessCount, Is.EqualTo(3)); // initialization (2) + clock over
70+
if (TenantIdentifier == null)
71+
{
72+
Assert.That(optimizer.LastSourceValue, Is.EqualTo((increment * 2) + 1)); // initialization (2) + clock over
73+
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
74+
}
6575
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo((increment * 2) + 1)); // initialization (2) + clock over
6676
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
6777

‎src/NHibernate.Test/IdGen/Enhanced/Forcedtable/HiLoForcedTableSequenceTest.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ public void TestNormalBoundary()
4747
long expectedId = i + 1;
4848
Assert.That(entities[i].Id, Is.EqualTo(expectedId));
4949
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(1)); // initialization
50+
if (TenantIdentifier == null)
51+
{
52+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
53+
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
54+
Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
55+
}
5056
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
5157
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
5258
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
@@ -57,6 +63,12 @@ public void TestNormalBoundary()
5763
session.Save(entities[increment]);
5864
Assert.That(entities[optimizer.IncrementSize].Id, Is.EqualTo(optimizer.IncrementSize + 1));
5965
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization + clock-over
66+
if (TenantIdentifier == null)
67+
{
68+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(2)); // initialization + clock-over
69+
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
70+
Assert.That(optimizer.HiValue, Is.EqualTo(increment * 2 + 1));
71+
}
6072
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2)); // initialization + clock-over
6173
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
6274
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));

‎src/NHibernate.Test/IdGen/Enhanced/Forcedtable/PooledForcedTableSequenceTest.cs‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ public void TestNormalBoundary()
4848
Assert.That(entities[i].Id, Is.EqualTo(expectedId));
4949
// NOTE : initialization calls table twice
5050
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization
51+
if (TenantIdentifier == null)
52+
{
53+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization
54+
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
55+
}
5156
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization
5257
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
5358
}
@@ -59,9 +64,15 @@ public void TestNormalBoundary()
5964
Assert.That(entities[optimizer.IncrementSize].Id, Is.EqualTo(optimizer.IncrementSize + 1));
6065
// initialization (2) + clock over
6166
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(3));
62-
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment*2 + 1));
67+
if (TenantIdentifier == null)
68+
{
69+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment * 2 + 1));
70+
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
71+
}
72+
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));
6373
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
6474

75+
6576
transaction.Commit();
6677
}
6778

‎src/NHibernate.Test/IdGen/Enhanced/Sequence/HiLoSequenceTest.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ public void TestNormalBoundary()
4545
entities[i] = new Entity("" + (i + 1));
4646
session.Save(entities[i]);
4747
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(1)); // initialization
48+
if (TenantIdentifier == null)
49+
{
50+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
51+
Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
52+
Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
53+
}
4854
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
4955
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
5056
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
@@ -54,6 +60,12 @@ public void TestNormalBoundary()
5460
entities[increment] = new Entity("" + increment);
5561
session.Save(entities[increment]);
5662
Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2));
63+
if (TenantIdentifier == null)
64+
{
65+
Assert.That(optimizer.LastSourceValue, Is.EqualTo(2));
66+
Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
67+
Assert.That(optimizer.HiValue, Is.EqualTo(increment * 2 + 1));
68+
}
5769
Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2));
5870
Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
5971
Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));

0 commit comments

Comments
 (0)