Skip to content

Commit bc53d66

Browse files
fabiomaulofabiomaulo
committed
- Ported test for composite-id from H3.2
- Aligned constraint for "join fetch", using <bag>, between HQL and Criteria (removed NH different behavior in BasicLoader) - Changed NH846 according the "new" behavior (the type of the collection was not the matter of the test) Possible Breaking change: - The alignment of constraint should break some Criteria SVN: trunk@3704
1 parent cf9255f commit bc53d66

16 files changed

+781
-21
lines changed

‎src/NHibernate.Test/CompositeId/CompositeIdFixture.cs

+283
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,283 @@
1+
using System;
2+
using System.Collections;
3+
using NUnit.Framework;
4+
5+
namespace NHibernate.Test.CompositeId
6+
{
7+
[TestFixture]
8+
public class CompositeIdFixture : TestCase
9+
{
10+
protected override string MappingsAssembly
11+
{
12+
get { return "NHibernate.Test"; }
13+
}
14+
15+
protected override IList Mappings
16+
{
17+
get
18+
{
19+
return new string[]
20+
{
21+
"CompositeId.Customer.hbm.xml", "CompositeId.Order.hbm.xml", "CompositeId.LineItem.hbm.xml",
22+
"CompositeId.Product.hbm.xml"
23+
};
24+
}
25+
}
26+
27+
protected override string CacheConcurrencyStrategy
28+
{
29+
get { return null; }
30+
}
31+
32+
[Test]
33+
public void CompositeIds()
34+
{
35+
ISession s;
36+
ITransaction t;
37+
Product p2;
38+
using (s = OpenSession())
39+
{
40+
t = s.BeginTransaction();
41+
42+
Product p = new Product();
43+
p.ProductId = "A123";
44+
p.Description = "nipple ring";
45+
p.Price = 1.0m;
46+
p.NumberAvailable = 1004;
47+
s.Persist(p);
48+
49+
p2 = new Product();
50+
p2.ProductId = "X525";
51+
p2.Description = "nose stud";
52+
p2.Price = 3.0m;
53+
p2.NumberAvailable = 105;
54+
s.Persist(p2);
55+
56+
Customer c = new Customer();
57+
c.Address = "St Kilda Rd, MEL, 3000";
58+
c.Name = "Virginia";
59+
c.CustomerId = "C111";
60+
s.Persist(c);
61+
62+
Order o = new Order(c);
63+
o.OrderDate = DateTime.Today;
64+
LineItem li = new LineItem(o, p);
65+
li.Quantity = 2;
66+
67+
t.Commit();
68+
}
69+
70+
using (s = OpenSession())
71+
{
72+
t = s.BeginTransaction();
73+
Order o = s.Get<Order>(new Order.ID("C111", 0));
74+
Assert.That(o.Total == 2m);
75+
t.Commit();
76+
}
77+
78+
using(s = OpenSession())
79+
{
80+
t = s.BeginTransaction();
81+
s.CreateQuery(
82+
"from Customer c left join fetch c.Orders o left join fetch o.LineItems li left join fetch li.Product p").List();
83+
t.Commit();
84+
}
85+
86+
using(s = OpenSession())
87+
{
88+
t = s.BeginTransaction();
89+
s.CreateQuery("from Order o left join fetch o.LineItems li left join fetch li.Product p").List();
90+
t.Commit();
91+
}
92+
93+
using(s = OpenSession())
94+
{
95+
t = s.BeginTransaction();
96+
IEnumerable iter = s.CreateQuery("select o.id, li.id from Order o join o.LineItems li").List();
97+
foreach (object[] stuff in iter)
98+
{
99+
Assert.AreEqual(2, stuff.Length);
100+
}
101+
iter = s.CreateQuery("from Order o join o.LineItems li").Enumerable();
102+
foreach (object[] stuff in iter)
103+
{
104+
Assert.AreEqual(2, stuff.Length);
105+
}
106+
t.Commit();
107+
}
108+
109+
using(s = OpenSession())
110+
{
111+
t = s.BeginTransaction();
112+
Customer c = s.Get<Customer>("C111");
113+
Order o2 = new Order(c);
114+
o2.OrderDate = DateTime.Today;
115+
s.Flush();
116+
LineItem li2 = new LineItem(o2, p2);
117+
li2.Quantity = 5;
118+
IList bigOrders = s.CreateQuery("from Order o where o.Total>10.0").List();
119+
Assert.AreEqual(1, bigOrders.Count);
120+
t.Commit();
121+
}
122+
123+
124+
using (s = OpenSession())
125+
{
126+
t = s.BeginTransaction();
127+
s.Delete("from LineItem");
128+
s.Delete("from Order");
129+
s.Delete("from Customer");
130+
s.Delete("from Product");
131+
t.Commit();
132+
}
133+
}
134+
135+
[Test]
136+
public void MultipleCollectionFetch()
137+
{
138+
ISession s = OpenSession();
139+
ITransaction t = s.BeginTransaction();
140+
Product p = new Product();
141+
p.ProductId = "A123";
142+
p.Description = "nipple ring";
143+
p.Price = 1.0m;
144+
p.NumberAvailable = 1004;
145+
s.Persist(p);
146+
147+
Product p2 = new Product();
148+
p2.ProductId = "X525";
149+
p2.Description = "nose stud";
150+
p2.Price = 3.0m;
151+
p2.NumberAvailable = 105;
152+
s.Persist(p2);
153+
154+
Customer c = new Customer();
155+
c.Address = "St Kilda Rd, MEL, 3000";
156+
c.Name = "Virginia";
157+
c.CustomerId = "C111";
158+
s.Persist(c);
159+
160+
Order o = new Order(c);
161+
o.OrderDate = DateTime.Today;
162+
LineItem li = new LineItem(o, p);
163+
li.Quantity = 2;
164+
LineItem li2 = new LineItem(o, p2);
165+
li2.Quantity = 3;
166+
167+
Order o2 = new Order(c);
168+
o2.OrderDate = DateTime.Today;
169+
LineItem li3 = new LineItem(o2, p);
170+
li3.Quantity = 1;
171+
LineItem li4 = new LineItem(o2, p2);
172+
li4.Quantity = 1;
173+
174+
t.Commit();
175+
s.Close();
176+
177+
s = OpenSession();
178+
t = s.BeginTransaction();
179+
c =
180+
(Customer)
181+
s.CreateQuery(
182+
"from Customer c left join fetch c.Orders o left join fetch o.LineItems li left join fetch li.Product p").
183+
UniqueResult();
184+
Assert.IsTrue(NHibernateUtil.IsInitialized(c.Orders));
185+
Assert.AreEqual(2, c.Orders.Count);
186+
Assert.IsTrue(NHibernateUtil.IsInitialized(((Order) c.Orders[0]).LineItems));
187+
Assert.IsTrue(NHibernateUtil.IsInitialized(((Order) c.Orders[1]).LineItems));
188+
Assert.AreEqual(((Order) c.Orders[0]).LineItems.Count, 2);
189+
Assert.AreEqual(((Order) c.Orders[1]).LineItems.Count, 2);
190+
t.Commit();
191+
s.Close();
192+
193+
s = OpenSession();
194+
t = s.BeginTransaction();
195+
s.Delete("from LineItem");
196+
s.Delete("from Order");
197+
s.Delete("from Customer");
198+
s.Delete("from Product");
199+
t.Commit();
200+
s.Close();
201+
}
202+
203+
[Test]
204+
public void NonLazyFetch()
205+
{
206+
ISession s = OpenSession();
207+
ITransaction t = s.BeginTransaction();
208+
Product p = new Product();
209+
p.ProductId = "A123";
210+
p.Description = "nipple ring";
211+
p.Price = 1.0m;
212+
p.NumberAvailable = 1004;
213+
s.Persist(p);
214+
215+
Product p2 = new Product();
216+
p2.ProductId = "X525";
217+
p2.Description = "nose stud";
218+
p2.Price = 3.0m;
219+
p2.NumberAvailable = 105;
220+
s.Persist(p2);
221+
222+
Customer c = new Customer();
223+
c.Address = "St Kilda Rd, MEL, 3000";
224+
c.Name = "Virginia";
225+
c.CustomerId = "C111";
226+
s.Persist(c);
227+
228+
Order o = new Order(c);
229+
o.OrderDate = DateTime.Today;
230+
LineItem li = new LineItem(o, p);
231+
li.Quantity = 2;
232+
233+
t.Commit();
234+
s.Close();
235+
236+
s = OpenSession();
237+
t = s.BeginTransaction();
238+
o = s.Get<Order>(new Order.ID("C111", 0));
239+
Assert.AreEqual(2m, o.Total);
240+
t.Commit();
241+
s.Close();
242+
243+
s = OpenSession();
244+
t = s.BeginTransaction();
245+
o = (Order) s.CreateQuery("from Order o left join fetch o.LineItems li left join fetch li.Product p").UniqueResult();
246+
Assert.IsTrue(NHibernateUtil.IsInitialized(o.LineItems));
247+
li = (LineItem) o.LineItems[0];
248+
Assert.IsTrue(NHibernateUtil.IsInitialized(li));
249+
Assert.IsTrue(NHibernateUtil.IsInitialized(li.Product));
250+
t.Commit();
251+
s.Close();
252+
253+
s = OpenSession();
254+
t = s.BeginTransaction();
255+
o = (Order) s.CreateQuery("from Order o").UniqueResult();
256+
Assert.IsTrue(NHibernateUtil.IsInitialized(o.LineItems));
257+
li = (LineItem) o.LineItems[0];
258+
Assert.IsTrue(NHibernateUtil.IsInitialized(li));
259+
Assert.IsFalse(NHibernateUtil.IsInitialized(li.Product));
260+
t.Commit();
261+
s.Close();
262+
263+
s = OpenSession();
264+
t = s.BeginTransaction();
265+
s.Delete("from LineItem");
266+
s.Delete("from Order");
267+
s.Delete("from Customer");
268+
s.Delete("from Product");
269+
t.Commit();
270+
s.Close();
271+
}
272+
273+
[Test]
274+
public void Query()
275+
{
276+
ISession s = OpenSession();
277+
ITransaction t = s.BeginTransaction();
278+
s.CreateQuery("from LineItem ol where ol.Order.Id.CustomerId = 'C111'").List();
279+
t.Commit();
280+
s.Close();
281+
}
282+
}
283+
}

‎src/NHibernate.Test/CompositeId/Customer.cs

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
using System.Collections;
2+
using System;
3+
4+
namespace NHibernate.Test.CompositeId
5+
{
6+
public class Customer
7+
{
8+
private string customerId;
9+
private string name;
10+
private string address;
11+
private IList orders = new ArrayList();
12+
13+
public virtual string CustomerId
14+
{
15+
get { return customerId; }
16+
set { customerId = value; }
17+
}
18+
19+
public virtual string Name
20+
{
21+
get { return name; }
22+
set { name = value; }
23+
}
24+
25+
public virtual string Address
26+
{
27+
get { return address; }
28+
set { address = value; }
29+
}
30+
31+
public virtual IList Orders
32+
{
33+
get { return orders; }
34+
set { orders = value; }
35+
}
36+
37+
public virtual Order GenerateNewOrder(decimal total)
38+
{
39+
Order order = new Order(this);
40+
order.OrderDate = DateTime.Today;
41+
order.Total=total;
42+
43+
return order;
44+
}
45+
}
46+
}

‎src/NHibernate.Test/CompositeId/Customer.hbm.xml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
4+
This mapping demonstrates how to map a collection
5+
<key> to one of the primary key columns of an
6+
associated child class with a composite key. This
7+
is very useful for legacy data!
8+
9+
-->
10+
11+
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
12+
namespace="NHibernate.Test.CompositeId"
13+
assembly="NHibernate.Test"
14+
default-access="field.camelcase">
15+
16+
<class name="Customer">
17+
18+
<id name="CustomerId"
19+
length="10">
20+
<generator class="assigned"/>
21+
</id>
22+
23+
<property name="Name" not-null="true" length="100"/>
24+
<property name="Address" not-null="true" length="200"/>
25+
26+
<list name="Orders" inverse="true" cascade="save-update">
27+
<key column="customerId"/>
28+
<index column="orderNumber"/>
29+
<one-to-many class="Order"/>
30+
</list>
31+
</class>
32+
33+
</hibernate-mapping>

0 commit comments

Comments
 (0)