GH2552 Add tests to verify that the cache is updated on delete.

Author: David Ellingsworth

src/NHibernate.Test/NHSpecificTest/GH2552/Fixture.cs

@@ -65,6 +65,79 @@ protected override void OnTearDown()
 			Assert.AreEqual(0, statistics.SecondLevelCacheMissCount, "Second level cache miss count");
 		}
 
+		private void OneToOneUpdateTest<TPerson, TDetails>() where TPerson : Person, new() where TDetails : Details, new()
+		{
+			List<object> ids = this.CreatePersonAndDetails<TPerson, TDetails>();
+
+			IStatistics statistics = Sfi.Statistics;
+
+			// Clear the second level cache and the statistics
+			Sfi.EvictEntity(typeof(TPerson).FullName);
+			Sfi.EvictEntity(typeof(TDetails).FullName);
+			Sfi.EvictQueries();
+
+			statistics.Clear();
+
+			// Fill the empty caches with data.
+			this.FetchPeopleById<TPerson>(ids);
+
+			// Verify that no data was retrieved from the cache.
+			Assert.AreEqual(0, statistics.SecondLevelCacheHitCount, "Second level cache hit count");
+			statistics.Clear();
+
+			int personId = DeleteDetailsFromFirstPerson<TPerson>();
+
+			// Verify that the cache was updated
+			Assert.AreEqual(1, statistics.SecondLevelCachePutCount, "Second level cache put count");
+			statistics.Clear();
+
+			// Verify that the Person was updated in the cache
+			using (ISession s = Sfi.OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				TPerson person = s.Get<TPerson>(personId);
+
+				Assert.IsNull(person.Details);
+			}
+
+			Assert.AreEqual(0, statistics.SecondLevelCacheMissCount, "Second level cache miss count");
+			statistics.Clear();
+
+			// Verify that the Details was removed from the cache and deleted.
+			using (ISession s = Sfi.OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				TDetails details = s.Get<TDetails>(personId);
+
+				Assert.Null(details);
+			}
+
+			Assert.AreEqual(0, statistics.SecondLevelCacheHitCount, "Second level cache hit count");
+		}
+
+		private int DeleteDetailsFromFirstPerson<TPerson>() where TPerson:Person
+		{
+			using (ISession s = Sfi.OpenSession())
+			using (ITransaction tx = s.BeginTransaction())
+			{
+				// Get the first person with details.
+				Person person = s.QueryOver<TPerson>()
+					.Where(p => p.Details != null)
+					.Take(1)
+					.SingleOrDefault();
+
+				Assert.NotNull(person);
+				Assert.NotNull(person.Details);
+
+				s.SaveOrUpdate(person);
+				person.Details = null;
+
+				tx.Commit();
+
+				return person.Id;
+			}
+		}
+
 		private List<object> CreatePersonAndDetails<TPerson, TDetails>() where TPerson : Person, new() where TDetails : Details, new()
 		{
 			List<object> ids = new List<object>();
@@ -125,5 +198,17 @@ public void OneToOneCacheFetchByRef()
 		{
 			OneToOneFetchTest<PersonByRef, DetailsByRef>();
 		}
+
+		[Test]
+		public void OneToOneCacheUpdateByForeignKey()
+		{
+			OneToOneUpdateTest<PersonByFK, DetailsByFK>();
+		}
+
+		[Test]
+		public void OneToOneCacheUpdateByRef()
+		{
+			OneToOneUpdateTest<PersonByRef, DetailsByRef>();
+		}
 	}
 }

src/NHibernate.Test/NHSpecificTest/GH2552/Mappings.hbm.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test" namespace="NHibernate.Test.NHSpecificTest.GH2552">
   <class name="PersonByFK" batch-size="3">
-    <cache usage="read-only"/>
+    <cache usage="read-write"/>
     <id name="Id" unsaved-value="0" generator="native"/>
     <property name="Name"/>
-    <one-to-one name="Details" class="DetailsByFK" fetch="join" cascade="all"/>
+    <one-to-one name="Details" class="DetailsByFK" fetch="join" cascade="all-delete-orphan"/>
   </class>
 
   <class name="DetailsByFK">
-    <cache usage="read-only"/>
+    <cache usage="read-write"/>
     <id name="Id" unsaved-value="0">
       <generator class="foreign">
         <param name="property">Person</param>
@@ -19,14 +19,14 @@
   </class>
 
   <class name="PersonByRef" batch-size="3">
-    <cache usage="read-only"/>
+    <cache usage="read-write"/>
     <id name="Id" unsaved-value="0" generator="native"/>
     <property name="Name" />
-    <one-to-one name="Details" class="DetailsByRef" property-ref="Person" fetch="join" cascade="all"/>
+    <one-to-one name="Details" class="DetailsByRef" property-ref="Person" fetch="join" cascade="all-delete-orphan"/>
   </class>
 
   <class name="DetailsByRef">
-    <cache usage="read-only"/>
+    <cache usage="read-write"/>
     <id name="Id" unsaved-value="0" generator="native"/>
     <many-to-one name="Person" class="PersonByRef" column="PersonId" unique="true"/>
     <property name="Data"/>