Added test

Author: maca88

src/NHibernate.DomainModel/Northwind/Entities/Order.cs

@@ -6,7 +6,7 @@ namespace NHibernate.DomainModel.Northwind.Entities
 {
     public class Order
     {
-        private readonly ISet<OrderLine> _orderLines;
+        private readonly IList<OrderLine> _orderLines;
         private Customer _customer;
         private Employee _employee;
         private decimal? _freight;
@@ -20,7 +20,7 @@ public class Order
 
         public Order()         
         {
-            _orderLines = new HashSet<OrderLine>();
+            _orderLines = new List<OrderLine>();
         }
 
         public virtual int OrderId
@@ -83,7 +83,7 @@ public virtual Address ShippingAddress
             set { _shippingAddress = value; }
         }
 
-        public virtual ISet<OrderLine> OrderLines
+        public virtual IList<OrderLine> OrderLines
         {
             get { return _orderLines; }
         }
@@ -106,4 +106,4 @@ public virtual void RemoveOrderLine(OrderLine orderLine)
             }
         }
     }
-}
+}

src/NHibernate.DomainModel/Northwind/Mappings/Customer.hbm.xml

@@ -3,6 +3,7 @@
 									 namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
 
 	<class name="Customer" table="Customers">
+	  <cache usage="nonstrict-read-write"/>
 		<id name="CustomerId" column="CustomerId" type="string" unsaved-value="-1" 
 				access="field.camelcase-underscore">
 			<generator class="assigned" />
@@ -45,10 +46,11 @@
 
 		<set name="Orders" lazy="true" access="field.camelcase-underscore"
 				 cascade="all-delete-orphan" inverse="true">
+		  <cache usage="nonstrict-read-write"/>
 			<key column="CustomerId"/>
 			<one-to-many class="Order"/>
 		</set>		
 
 	</class>
 
-</hibernate-mapping>
+</hibernate-mapping>

src/NHibernate.DomainModel/Northwind/Mappings/Order.hbm.xml

@@ -3,6 +3,7 @@
 									 namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
 
 	<class name="Order" table="Orders">
+	  <cache usage="nonstrict-read-write"/>
 		<id name="OrderId" column="OrderId" type="int" unsaved-value="-1" 
 				access="field.camelcase-underscore">
 			<generator class="assigned" />
@@ -52,12 +53,13 @@
 
 		</component>
 
-		<set name="OrderLines" lazy="true" access="field.camelcase-underscore"
+		<bag name="OrderLines" lazy="true" access="field.camelcase-underscore"
 				 cascade="all-delete-orphan" inverse="true">
+		  <cache usage="nonstrict-read-write"/>
 			<key column="OrderId"/>
 			<one-to-many class="OrderLine"/>
-		</set>
+		</bag>
 
 	</class>
 
-</hibernate-mapping>
+</hibernate-mapping>

src/NHibernate.DomainModel/Northwind/Mappings/OrderLine.hbm.xml

@@ -3,7 +3,7 @@
 									 namespace="NHibernate.DomainModel.Northwind.Entities" assembly="NHibernate.DomainModel">
 
 	<class name="OrderLine" table="OrderLines">
-
+	  <cache usage="nonstrict-read-write"/>
 		<id name="Id" column="OrderLineId" type="long" unsaved-value="-1" 
 				access="field.camelcase-underscore">
 			<generator class="native" />
@@ -26,4 +26,4 @@
 
 	</class>
 
-</hibernate-mapping>
+</hibernate-mapping>

src/NHibernate.Test/Async/Linq/ProjectionsTests.cs

@@ -297,7 +297,7 @@ public async Task ProjectAnonymousTypeWithCollection3Async()
 		public async Task ProjectKnownTypeWithCollectionAsync()
 		{
 			var query = from o in db.Orders
-						select new ExpandedWrapper<Order, ISet<OrderLine>>
+						select new ExpandedWrapper<Order, IList<OrderLine>>
 							{
 								ExpandedElement = o,
 								ProjectedProperty0 = o.OrderLines,

src/NHibernate.Test/Linq/ProjectionsTests.cs

@@ -285,7 +285,7 @@ public void ProjectAnonymousTypeWithCollection3()
 		public void ProjectKnownTypeWithCollection()
 		{
 			var query = from o in db.Orders
-						select new ExpandedWrapper<Order, ISet<OrderLine>>
+						select new ExpandedWrapper<Order, IList<OrderLine>>
 							{
 								ExpandedElement = o,
 								ProjectedProperty0 = o.OrderLines,

src/NHibernate.Test/Linq/QueryCacheableTests.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using NHibernate.Cfg;
+using NHibernate.DomainModel.Northwind.Entities;
 using NHibernate.Linq;
 using NUnit.Framework;
 
@@ -195,6 +196,52 @@ public void GroupByQueryIsCacheable()
 			Assert.That(Sfi.Statistics.QueryCacheHitCount, Is.EqualTo(1), "Unexpected cache hit count");
 		}
 
+		[Test]
+		public void CartesianProduct()
+		{
+			Sfi.Statistics.Clear();
+			Sfi.EvictQueries();
+
+			Order order;
+
+			using (var s = Sfi.OpenSession())
+			{
+				order = s.Query<Order>()
+				         .FetchMany(x => x.OrderLines)
+				         .Where(x => x.OrderId == 10248)
+				         .ToList()
+				         .First();
+			}
+
+			Assert.That(order.OrderLines, Has.Count.EqualTo(3));
+
+			using (var s = Sfi.OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				order = s.Query<Order>()
+				         .WithOptions(o => o.SetCacheable(true))
+				         .Fetch(x => x.Customer).ThenFetchMany(x => x.Orders)
+				         .FetchMany(x => x.OrderLines)
+				         .Where(x => x.OrderId == 10248)
+				         .ToList()
+				         .First();
+
+				t.Commit();
+			}
+
+			Assert.That(order.OrderLines, Has.Count.EqualTo(15));
+
+			using (var s = Sfi.OpenSession())
+			using (var t = s.BeginTransaction())
+			{
+				order = s.Get<Order>(10248);
+				NHibernateUtil.Initialize(order.OrderLines);
+				t.Commit();
+			}
+
+			Assert.That(order.OrderLines, Has.Count.EqualTo(15));
+		}
+
 		[Test]
 		public void GroupByQueryIsCacheable2()
 		{