[Nhibernate-commit] SF.net SVN: nhibernate:[5236] trunk/nhibernate/src/NHibernate

[<fab...@us...>]

Revision: 5236
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5236&view=rev
Author:   fabiomaulo
Date:     2010-10-07 13:48:36 +0000 (Thu, 07 Oct 2010)

Log Message:
-----------
Fix NH-2313

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/Domain.cs
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/Fixture.cs
    trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/Mappings.hbm.xml

Modified: trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs	2010-10-07 12:34:39 UTC (rev 5235)
+++ trunk/nhibernate/src/NHibernate/Cfg/Configuration.cs	2010-10-07 13:48:36 UTC (rev 5236)
@@ -196,8 +196,8 @@
 
 			private PersistentClass GetPersistentClass(string className)
 			{
-				PersistentClass pc = configuration.classes[className];
-				if (pc == null)
+				PersistentClass pc;
+				if (!configuration.classes.TryGetValue(className, out pc))
 				{
 					throw new MappingException("persistent class not known: " + className);
 				}

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/Domain.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/Domain.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/Domain.cs	2010-10-07 13:48:36 UTC (rev 5236)
@@ -0,0 +1,12 @@
+namespace NHibernate.Test.NHSpecificTest.NH2313
+{
+	public class MyClass
+	{
+		public virtual TheOtherPart TheOtherPart { get; set; }
+	}
+
+	public class TheOtherPart
+	{
+		
+	}
+}
\ No newline at end of file

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/Fixture.cs	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/Fixture.cs	2010-10-07 13:48:36 UTC (rev 5236)
@@ -0,0 +1,17 @@
+using NHibernate.Cfg;
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Test.NHSpecificTest.NH2313
+{
+	public class Fixture
+	{
+		[Test]
+		public void WhenLoadWorngMappingThenMessageShouldContaingWrongClassName()
+		{
+			Configuration cfg = TestConfigurationHelper.GetDefaultConfiguration();
+			cfg.AddResource("NHibernate.Test.NHSpecificTest.NH2313.Mappings.hbm.xml", GetType().Assembly);
+			cfg.Executing(c=> c.BuildSessionFactory()).Throws<MappingException>().And.ValueOf.Message.Should().Contain("TheOther");
+		}
+	}
+}
\ No newline at end of file

Added: trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/Mappings.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/Mappings.hbm.xml	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/NHSpecificTest/NH2313/Mappings.hbm.xml	2010-10-07 13:48:36 UTC (rev 5236)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
+                   assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.NH2313">
+
+  <class name="MyClass">
+    <id type="int">
+      <generator class="native" />
+    </id>
+    <one-to-one name="TheOtherPart" class="TheOther"/>
+  </class>
+  
+  <class name="TheOtherPart">
+    <id type="int">
+      <generator class="native" />
+    </id>
+  </class>
+</hibernate-mapping>

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2010-10-07 12:34:39 UTC (rev 5235)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2010-10-07 13:48:36 UTC (rev 5236)
@@ -509,6 +509,8 @@
     <Compile Include="NHSpecificTest\NH2302\StringLengthEntity.cs" />
     <Compile Include="NHSpecificTest\NH2303\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2303\Model.cs" />
+    <Compile Include="NHSpecificTest\NH2313\Domain.cs" />
+    <Compile Include="NHSpecificTest\NH2313\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2322\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH2322\Model.cs" />
     <Compile Include="NHSpecificTest\NH2322\PostUpdateEventListener.cs" />
@@ -2323,6 +2325,7 @@
     <EmbeddedResource Include="CollectionTest\NullableValueTypeElementMapFixture.hbm.xml" />
     <EmbeddedResource Include="DriverTest\EntityForMs2008.hbm.xml" />
     <Content Include="DynamicEntity\package.html" />
+    <EmbeddedResource Include="NHSpecificTest\NH2313\Mappings.hbm.xml" />
     <EmbeddedResource Include="TypesTest\UriClass.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\EntityNameWithFullName\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH2361\Mappings.hbm.xml" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.