Corrections in review

nhibernate · Oct 24, 2024 · ff20724 · ff20724
1 parent e63dca4
commit ff20724
Show file tree

Hide file tree

Showing 21 changed files with 211 additions and 51 deletions.
diff --git a/src/NHibernate.Test/Async/IdGen/Enhanced/Forcedtable/HiLoForcedTableSequenceTest.cs b/src/NHibernate.Test/Async/IdGen/Enhanced/Forcedtable/HiLoForcedTableSequenceTest.cs
@@ -58,6 +58,12 @@ public async Task TestNormalBoundaryAsync()
 						long expectedId = i + 1;
 						Assert.That(entities[i].Id, Is.EqualTo(expectedId));
 						Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(1)); // initialization
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+							Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 						Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
@@ -68,6 +74,12 @@ public async Task TestNormalBoundaryAsync()
 					await (session.SaveAsync(entities[increment]));
 					Assert.That(entities[optimizer.IncrementSize].Id, Is.EqualTo(optimizer.IncrementSize + 1));
 					Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization + clock-over
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo(2)); // initialization + clock-over
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+						Assert.That(optimizer.HiValue, Is.EqualTo(increment * 2 + 1));
+					}
 					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2)); // initialization + clock-over
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 					Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));

diff --git a/src/NHibernate.Test/Async/IdGen/Enhanced/Forcedtable/PooledForcedTableSequenceTest.cs b/src/NHibernate.Test/Async/IdGen/Enhanced/Forcedtable/PooledForcedTableSequenceTest.cs
@@ -59,6 +59,11 @@ public async Task TestNormalBoundaryAsync()
 						Assert.That(entities[i].Id, Is.EqualTo(expectedId));
 						// NOTE : initialization calls table twice
 						Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 					}
@@ -70,9 +75,15 @@ public async Task TestNormalBoundaryAsync()
 					Assert.That(entities[optimizer.IncrementSize].Id, Is.EqualTo(optimizer.IncrementSize + 1));
 					// initialization (2) + clock over
 					Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(3));
-					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment*2 + 1));
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment * 2 + 1));
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+					}
+					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 
+
 					await (transaction.CommitAsync());
 				}
 

diff --git a/src/NHibernate.Test/Async/IdGen/Enhanced/Sequence/HiLoSequenceTest.cs b/src/NHibernate.Test/Async/IdGen/Enhanced/Sequence/HiLoSequenceTest.cs
@@ -56,6 +56,12 @@ public async Task TestNormalBoundaryAsync()
 						entities[i] = new Entity("" + (i + 1));
 						await (session.SaveAsync(entities[i]));
 						Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(1)); // initialization
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+							Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 						Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
@@ -65,6 +71,12 @@ public async Task TestNormalBoundaryAsync()
 					entities[increment] = new Entity("" + increment);
 					await (session.SaveAsync(entities[increment]));
 					Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2));
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo(2));
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+						Assert.That(optimizer.HiValue, Is.EqualTo(increment * 2 + 1));
+					}
 					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2));
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 					Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));

diff --git a/src/NHibernate.Test/Async/IdGen/Enhanced/Sequence/PooledSequenceTest.cs b/src/NHibernate.Test/Async/IdGen/Enhanced/Sequence/PooledSequenceTest.cs
@@ -55,6 +55,11 @@ public async Task TestNormalBoundaryAsync()
 						entities[i] = new Entity("" + (i + 1));
 						await (session.SaveAsync(entities[i]));
 						Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization calls seq twice
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization calls seq twice
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization calls seq twice
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 					}
@@ -63,6 +68,11 @@ public async Task TestNormalBoundaryAsync()
 					entities[increment] = new Entity("" + increment);
 					await (session.SaveAsync(entities[increment]));
 					Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(3)); // initialization (2) + clock over
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment * 2 + 1)); // initialization (2) + clock over
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+					}
 					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1)); // initialization (2) + clock over
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 

diff --git a/src/NHibernate.Test/Async/IdGen/Enhanced/Table/HiLoTableTest.cs b/src/NHibernate.Test/Async/IdGen/Enhanced/Table/HiLoTableTest.cs
@@ -55,6 +55,12 @@ public async Task TestNormalBoundaryAsync()
 						entities[i] = new Entity("" + (i + 1));
 						await (s.SaveAsync(entities[i]));
 						Assert.That(generator.TableAccessCount, Is.EqualTo(1)); // initialization
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+							Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 						Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
@@ -64,6 +70,12 @@ public async Task TestNormalBoundaryAsync()
 					entities[increment] = new Entity("" + increment);
 					await (s.SaveAsync(entities[increment]));
 					Assert.That(generator.TableAccessCount, Is.EqualTo(2));
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo(2));
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+						Assert.That(optimizer.HiValue, Is.EqualTo((increment * 2) + 1));
+					}
 					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2));
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 					Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo((increment * 2) + 1));

diff --git a/src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledLoTableTest.cs b/src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledLoTableTest.cs
@@ -55,6 +55,11 @@ public async Task TestNormalBoundaryAsync()
 						entities[i] = new Entity("" + (i + 1));
 						await (s.SaveAsync(entities[i]));
 						Assert.That(generator.TableAccessCount, Is.EqualTo(1)); // initialization
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 					}
@@ -63,6 +68,11 @@ public async Task TestNormalBoundaryAsync()
 					entities[increment] = new Entity("" + increment);
 					await (s.SaveAsync(entities[increment]));
 					Assert.That(generator.TableAccessCount, Is.EqualTo(2));
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1));
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+					}
 					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1));
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 

diff --git a/src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledTableTest.cs b/src/NHibernate.Test/Async/IdGen/Enhanced/Table/PooledTableTest.cs
@@ -54,6 +54,11 @@ public async Task TestNormalBoundaryAsync()
 						entities[i] = new Entity("" + (i + 1));
 						await (s.SaveAsync(entities[i]));
 						Assert.That(generator.TableAccessCount, Is.EqualTo(2)); // initialization calls seq twice
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization calls seq twice
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization calls seq twice
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 					}
@@ -62,6 +67,11 @@ public async Task TestNormalBoundaryAsync()
 					entities[increment] = new Entity("" + increment);
 					await (s.SaveAsync(entities[increment]));
 					Assert.That(generator.TableAccessCount, Is.EqualTo(3)); // initialization (2) + clock over
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo((increment * 2) + 1)); // initialization (2) + clock over
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+					}
 					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo((increment * 2) + 1)); // initialization (2) + clock over
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 

diff --git a/src/NHibernate.Test/IdGen/Enhanced/Forcedtable/HiLoForcedTableSequenceTest.cs b/src/NHibernate.Test/IdGen/Enhanced/Forcedtable/HiLoForcedTableSequenceTest.cs
@@ -47,6 +47,12 @@ public void TestNormalBoundary()
 						long expectedId = i + 1;
 						Assert.That(entities[i].Id, Is.EqualTo(expectedId));
 						Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(1)); // initialization
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+							Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 						Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
@@ -57,6 +63,12 @@ public void TestNormalBoundary()
 					session.Save(entities[increment]);
 					Assert.That(entities[optimizer.IncrementSize].Id, Is.EqualTo(optimizer.IncrementSize + 1));
 					Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization + clock-over
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo(2)); // initialization + clock-over
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+						Assert.That(optimizer.HiValue, Is.EqualTo(increment * 2 + 1));
+					}
 					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2)); // initialization + clock-over
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 					Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));

diff --git a/src/NHibernate.Test/IdGen/Enhanced/Forcedtable/PooledForcedTableSequenceTest.cs b/src/NHibernate.Test/IdGen/Enhanced/Forcedtable/PooledForcedTableSequenceTest.cs
@@ -48,6 +48,11 @@ public void TestNormalBoundary()
 						Assert.That(entities[i].Id, Is.EqualTo(expectedId));
 						// NOTE : initialization calls table twice
 						Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 					}
@@ -59,9 +64,15 @@ public void TestNormalBoundary()
 					Assert.That(entities[optimizer.IncrementSize].Id, Is.EqualTo(optimizer.IncrementSize + 1));
 					// initialization (2) + clock over
 					Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(3));
-					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment*2 + 1));
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment * 2 + 1));
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+					}
+					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 
+
 					transaction.Commit();
 				}
 

diff --git a/src/NHibernate.Test/IdGen/Enhanced/Sequence/HiLoSequenceTest.cs b/src/NHibernate.Test/IdGen/Enhanced/Sequence/HiLoSequenceTest.cs
@@ -45,6 +45,12 @@ public void TestNormalBoundary()
 						entities[i] = new Entity("" + (i + 1));
 						session.Save(entities[i]);
 						Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(1)); // initialization
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+							Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 						Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
@@ -54,6 +60,12 @@ public void TestNormalBoundary()
 					entities[increment] = new Entity("" + increment);
 					session.Save(entities[increment]);
 					Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2));
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo(2));
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+						Assert.That(optimizer.HiValue, Is.EqualTo(increment * 2 + 1));
+					}
 					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2));
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 					Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1));

diff --git a/src/NHibernate.Test/IdGen/Enhanced/Sequence/PooledSequenceTest.cs b/src/NHibernate.Test/IdGen/Enhanced/Sequence/PooledSequenceTest.cs
@@ -44,6 +44,11 @@ public void TestNormalBoundary()
 						entities[i] = new Entity("" + (i + 1));
 						session.Save(entities[i]);
 						Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(2)); // initialization calls seq twice
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization calls seq twice
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization calls seq twice
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 					}
@@ -52,6 +57,11 @@ public void TestNormalBoundary()
 					entities[increment] = new Entity("" + increment);
 					session.Save(entities[increment]);
 					Assert.That(generator.DatabaseStructure.TimesAccessed, Is.EqualTo(3)); // initialization (2) + clock over
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment * 2 + 1)); // initialization (2) + clock over
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+					}
 					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment * 2 + 1)); // initialization (2) + clock over
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 

diff --git a/src/NHibernate.Test/IdGen/Enhanced/Table/HiLoTableTest.cs b/src/NHibernate.Test/IdGen/Enhanced/Table/HiLoTableTest.cs
@@ -44,6 +44,12 @@ public void TestNormalBoundary()
 						entities[i] = new Entity("" + (i + 1));
 						s.Save(entities[i]);
 						Assert.That(generator.TableAccessCount, Is.EqualTo(1)); // initialization
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+							Assert.That(optimizer.HiValue, Is.EqualTo(increment + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 						Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo(increment + 1));
@@ -53,6 +59,12 @@ public void TestNormalBoundary()
 					entities[increment] = new Entity("" + increment);
 					s.Save(entities[increment]);
 					Assert.That(generator.TableAccessCount, Is.EqualTo(2));
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo(2));
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+						Assert.That(optimizer.HiValue, Is.EqualTo((increment * 2) + 1));
+					}
 					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(2));
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 					Assert.That(optimizer.GetHiValue(TenantIdentifier), Is.EqualTo((increment * 2) + 1));

diff --git a/src/NHibernate.Test/IdGen/Enhanced/Table/PooledLoTableTest.cs b/src/NHibernate.Test/IdGen/Enhanced/Table/PooledLoTableTest.cs
@@ -44,6 +44,11 @@ public void TestNormalBoundary()
 						entities[i] = new Entity("" + (i + 1));
 						s.Save(entities[i]);
 						Assert.That(generator.TableAccessCount, Is.EqualTo(1)); // initialization
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(1)); // initialization
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(1)); // initialization
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 					}
@@ -52,6 +57,11 @@ public void TestNormalBoundary()
 					entities[increment] = new Entity("" + increment);
 					s.Save(entities[increment]);
 					Assert.That(generator.TableAccessCount, Is.EqualTo(2));
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1));
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+					}
 					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1));
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));
 

diff --git a/src/NHibernate.Test/IdGen/Enhanced/Table/PooledTableTest.cs b/src/NHibernate.Test/IdGen/Enhanced/Table/PooledTableTest.cs
@@ -43,6 +43,11 @@ public void TestNormalBoundary()
 						entities[i] = new Entity("" + (i + 1));
 						s.Save(entities[i]);
 						Assert.That(generator.TableAccessCount, Is.EqualTo(2)); // initialization calls seq twice
+						if (TenantIdentifier == null)
+						{
+							Assert.That(optimizer.LastSourceValue, Is.EqualTo(increment + 1)); // initialization calls seq twice
+							Assert.That(optimizer.LastValue, Is.EqualTo(i + 1));
+						}
 						Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo(increment + 1)); // initialization calls seq twice
 						Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(i + 1));
 					}
@@ -51,6 +56,11 @@ public void TestNormalBoundary()
 					entities[increment] = new Entity("" + increment);
 					s.Save(entities[increment]);
 					Assert.That(generator.TableAccessCount, Is.EqualTo(3)); // initialization (2) + clock over
+					if (TenantIdentifier == null)
+					{
+						Assert.That(optimizer.LastSourceValue, Is.EqualTo((increment * 2) + 1)); // initialization (2) + clock over
+						Assert.That(optimizer.LastValue, Is.EqualTo(increment + 1));
+					}
 					Assert.That(optimizer.GetLastSourceValue(TenantIdentifier), Is.EqualTo((increment * 2) + 1)); // initialization (2) + clock over
 					Assert.That(optimizer.GetLastValue(TenantIdentifier), Is.EqualTo(increment + 1));