Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[4790] trunk/nhibernate/src/NHibernate.Test
|
From: <fab...@us...> - 2009-10-18 20:37:58
|
Revision: 4790
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4790&view=rev
Author: fabiomaulo
Date: 2009-10-18 20:37:46 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
Merge r4789 (subtask NH-1368)
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/Model.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsBag.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsList.hbm.xml
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsSet.hbm.xml
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/Mappings.hbm.xml
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/Fixture.cs 2009-10-18 20:30:38 UTC (rev 4789)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/Fixture.cs 2009-10-18 20:37:46 UTC (rev 4790)
@@ -1,10 +1,11 @@
+using System.Collections;
using System.Collections.Generic;
+using Iesi.Collections.Generic;
using NUnit.Framework;
namespace NHibernate.Test.NHSpecificTest.NH1356
{
- [TestFixture]
- public class Fixture : BugTestCase
+ public abstract class Fixture : BugTestCase
{
[Test]
public void CanLoadWithGenericCompositeElement()
@@ -13,9 +14,7 @@
{
using (ITransaction tx = session.BeginTransaction())
{
- Person person = new Person();
- person.Name = "Bob";
- person.Addresses = new List<Address>();
+ var person = new Person {Name = "Bob", Addresses = NewCollection()};
person.Addresses.Add(new Address("123 Main St.", "Anytown", "LA", "12345"));
person.Addresses.Add(new Address("456 Main St.", "Anytown", "LA", "12345"));
@@ -25,7 +24,7 @@
}
using (ISession session = OpenSession())
{
- Person person = session.CreateQuery("from Person").UniqueResult<Person>();
+ var person = session.CreateQuery("from Person").UniqueResult<Person>();
Assert.IsNotNull(person);
Assert.IsNotNull(person.Addresses);
@@ -40,5 +39,49 @@
}
}
}
+
+ protected abstract ICollection<Address> NewCollection();
}
+
+ [TestFixture]
+ public class FixtureWithList : Fixture
+ {
+ protected override IList Mappings
+ {
+ get { return new[] {"NHSpecificTest." + BugNumber + ".MappingsList.hbm.xml"}; }
+ }
+
+ protected override ICollection<Address> NewCollection()
+ {
+ return new List<Address>();
+ }
+ }
+
+ [TestFixture]
+ public class FixtureWithBag : Fixture
+ {
+ protected override IList Mappings
+ {
+ get { return new[] {"NHSpecificTest." + BugNumber + ".MappingsBag.hbm.xml"}; }
+ }
+
+ protected override ICollection<Address> NewCollection()
+ {
+ return new List<Address>();
+ }
+ }
+
+ [TestFixture]
+ public class FixtureWithSet : Fixture
+ {
+ protected override IList Mappings
+ {
+ get { return new[] {"NHSpecificTest." + BugNumber + ".MappingsSet.hbm.xml"}; }
+ }
+
+ protected override ICollection<Address> NewCollection()
+ {
+ return new HashedSet<Address>();
+ }
+ }
}
\ No newline at end of file
Deleted: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/Mappings.hbm.xml 2009-10-18 20:30:38 UTC (rev 4789)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/Mappings.hbm.xml 2009-10-18 20:37:46 UTC (rev 4790)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test" namespace="NHibernate.Test.NHSpecificTest.NH1356">
- <class name="Person" lazy="false">
- <id name="Id">
- <generator class="native" />
- </id>
- <property name="Name" />
-
- <list name="Addresses" table="Addresses" lazy="false">
- <key column="PersonId" />
- <index column="Position" />
-
- <composite-element class="Address">
- <property name="Street" access="field.camelcase" />
- <property name="City" access="field.camelcase" />
- <property name="State" access="field.camelcase" />
- <property name="PostalCode" access="field.camelcase" />
- </composite-element>
- </list>
- </class>
-</hibernate-mapping>
Copied: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsBag.hbm.xml (from rev 4789, branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsBag.hbm.xml)
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsBag.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsBag.hbm.xml 2009-10-18 20:37:46 UTC (rev 4790)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test" namespace="NHibernate.Test.NHSpecificTest.NH1356">
+ <class name="Person" lazy="false">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="Name" />
+
+ <bag name="Addresses" table="Addresses" lazy="false" generic="true">
+ <key column="PersonId" />
+
+ <composite-element class="Address">
+ <property name="Street" access="field.camelcase" />
+ <property name="City" access="field.camelcase" />
+ <property name="State" access="field.camelcase" />
+ <property name="PostalCode" access="field.camelcase" />
+ </composite-element>
+ </bag>
+ </class>
+</hibernate-mapping>
Copied: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsList.hbm.xml (from rev 4789, branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsList.hbm.xml)
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsList.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsList.hbm.xml 2009-10-18 20:37:46 UTC (rev 4790)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test" namespace="NHibernate.Test.NHSpecificTest.NH1356">
+ <class name="Person" lazy="false">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="Name" />
+
+ <list name="Addresses" table="Addresses" lazy="false" generic="true">
+ <key column="PersonId" />
+ <index column="Position" />
+
+ <composite-element class="Address">
+ <property name="Street" access="field.camelcase" />
+ <property name="City" access="field.camelcase" />
+ <property name="State" access="field.camelcase" />
+ <property name="PostalCode" access="field.camelcase" />
+ </composite-element>
+ </list>
+ </class>
+</hibernate-mapping>
Copied: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsSet.hbm.xml (from rev 4789, branches/2.1.x/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsSet.hbm.xml)
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsSet.hbm.xml (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/MappingsSet.hbm.xml 2009-10-18 20:37:46 UTC (rev 4790)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test" namespace="NHibernate.Test.NHSpecificTest.NH1356">
+ <class name="Person" lazy="false">
+ <id name="Id">
+ <generator class="native" />
+ </id>
+ <property name="Name" />
+
+ <set name="Addresses" table="Addresses" lazy="false" generic="true">
+ <key column="PersonId" />
+
+ <composite-element class="Address">
+ <property name="Street" access="field.camelcase" />
+ <property name="City" access="field.camelcase" />
+ <property name="State" access="field.camelcase" />
+ <property name="PostalCode" access="field.camelcase" />
+ </composite-element>
+ </set>
+ </class>
+</hibernate-mapping>
Modified: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/Model.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/Model.cs 2009-10-18 20:30:38 UTC (rev 4789)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH1356/Model.cs 2009-10-18 20:37:46 UTC (rev 4790)
@@ -4,8 +4,7 @@
{
public class Person
{
- private IList<Address> addressBag;
- private IList<Address> addresses;
+ private ICollection<Address> addresses;
private int id;
private string name;
@@ -21,17 +20,11 @@
set { name = value; }
}
- public IList<Address> Addresses
+ public ICollection<Address> Addresses
{
get { return addresses; }
set { addresses = value; }
}
-
- public IList<Address> AddressBag
- {
- get { return addressBag; }
- set { addressBag = value; }
- }
}
public struct Address
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-10-18 20:30:38 UTC (rev 4789)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-10-18 20:37:46 UTC (rev 4790)
@@ -1985,9 +1985,6 @@
<EmbeddedResource Include="NHSpecificTest\NH693\SpaceTableName.hbm.xml" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="NHSpecificTest\NH1356\Mappings.hbm.xml" />
- </ItemGroup>
- <ItemGroup>
<EmbeddedResource Include="NHSpecificTest\NH1362\Mappings.hbm.xml" />
</ItemGroup>
<ItemGroup>
@@ -2046,6 +2043,9 @@
<EmbeddedResource Include="CfgTest\Loquacious\EntityToCache.hbm.xml" />
<EmbeddedResource Include="DriverTest\SqlServerCeEntity.hbm.xml" />
<Content Include="DynamicEntity\package.html" />
+ <EmbeddedResource Include="NHSpecificTest\NH1356\MappingsBag.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1356\MappingsList.hbm.xml" />
+ <EmbeddedResource Include="NHSpecificTest\NH1356\MappingsSet.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1785\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1255\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH1895\Mappings.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
