Merge pull request #247 from RogerKratz/NH3590

Failing test for NH3590

Author: oskarb

src/NHibernate.Test/NHSpecificTest/NH3590/Entity.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.NH3590
+{
+	public class Entity
+	{
+		public Entity()
+		{
+			Dates = new HashSet<DateTime>();
+		}
+
+		public virtual Guid Id { get; protected set; }
+		public virtual ISet<DateTime> Dates { get; protected set; }
+
+		public override bool Equals(object obj)
+		{
+			var that = obj as Entity;
+			return that != null && that.Id == Id;
+		}
+
+		public override int GetHashCode()
+		{
+			return Id.GetHashCode();
+		}
+	}
+}

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

@@ -0,0 +1,83 @@
+using System;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.NHSpecificTest.NH3590
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		private Entity entity;
+
+		protected override void OnSetUp()
+		{
+			entity = new Entity();
+			using (var s = OpenSession())
+			{
+				using (var tx = s.BeginTransaction())
+				{
+					s.Save(entity);
+					tx.Commit();
+				}
+			}
+		}
+
+		[Test, KnownBug("3590")]
+		public void ShouldUpdate()
+		{
+			entity.Dates.Add(DateTime.Now);
+			using (var s = OpenSession())
+			{
+				using (var tx = s.BeginTransaction())
+				{
+					s.Update(entity);
+					tx.Commit();
+				}
+			}
+
+			using (var s = OpenSession())
+			{
+				using (s.BeginTransaction())
+				{
+					s.Get<Entity>(entity.Id).Dates.Count
+						.Should().Be.EqualTo(1);
+				}
+			}
+		}
+
+		[Test, KnownBug("3590")]
+		public void ShouldMerge()
+		{
+			entity.Dates.Add(DateTime.Now);
+			using (var s = OpenSession())
+			{
+				using (var tx = s.BeginTransaction())
+				{
+					s.Merge(entity);
+					tx.Commit();
+				}
+			}
+
+			using (var s = OpenSession())
+			{
+				using (s.BeginTransaction())
+				{
+					s.Get<Entity>(entity.Id).Dates.Count
+						.Should().Be.EqualTo(1);
+				}
+			}
+		}
+
+		protected override void OnTearDown()
+		{
+			using (var s = OpenSession())
+			{
+				using (var tx = s.BeginTransaction())
+				{
+					s.Delete(s.Get<Entity>(entity.Id));
+					tx.Commit();
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+				   namespace="NHibernate.Test.NHSpecificTest.NH3590"
+				   assembly="NHibernate.Test">
+
+  <class name="Entity">
+    <id name="Id"
+          type="guid">
+      <generator class="guid.comb" />
+    </id>
+    <set name="Dates">
+      <key column="entity_id" />
+      <element column="Date" type="DateTime"/>
+    </set>
+  </class>
+</hibernate-mapping>

src/NHibernate.Test/NHibernate.Test.csproj

@@ -1155,6 +1155,8 @@
     <Compile Include="NHSpecificTest\ProxyValidator\ShouldBeProxiableTests.cs" />
     <Compile Include="NHSpecificTest\NH2898\ItemWithLazyProperty.cs" />
     <Compile Include="NHSpecificTest\NH2898\Fixture.cs" />
+    <Compile Include="NHSpecificTest\NH3590\Entity.cs" />
+    <Compile Include="NHSpecificTest\NH3590\Fixture.cs" />
     <Compile Include="NHSpecificTest\SqlConverterAndMultiQuery\Fixture.cs" />
     <Compile Include="NHSpecificTest\SqlConverterAndMultiQuery\Model.cs" />
     <Compile Include="NHSpecificTest\SqlConverterAndMultiQuery\SqlConverter.cs" />
@@ -3009,6 +3011,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="NHSpecificTest\NH3590\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH3377\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2865\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2756\Mappings.hbm.xml" />