From: <fab...@us...> - 2009-11-29 12:57:02
|
Revision: 4871 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4871&view=rev Author: fabiomaulo Date: 2009-11-29 12:56:53 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Binders refactoring (removed method used only in one test and removed the test itself) Modified Paths: -------------- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj Removed Paths: ------------- trunk/nhibernate/src/NHibernate.Test/CfgTest/HbmBinderFixture.cs Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs 2009-11-29 12:48:34 UTC (rev 4870) +++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/RootClassBinder.cs 2009-11-29 12:56:53 UTC (rev 4871) @@ -300,17 +300,6 @@ LogMappedProperty(property); } - public static void MakeVersion(XmlNode node, SimpleValue model) - { - if (node != null && node.Attributes != null) - { - XmlAttribute attribute = node.Attributes["unsaved-value"]; - model.NullValue = attribute == null ? null : attribute.Value; - } - else - model.NullValue = null; - } - private static void BindCache(HbmCache cacheSchema, RootClass rootClass) { if (cacheSchema != null) Deleted: trunk/nhibernate/src/NHibernate.Test/CfgTest/HbmBinderFixture.cs =================================================================== --- trunk/nhibernate/src/NHibernate.Test/CfgTest/HbmBinderFixture.cs 2009-11-29 12:48:34 UTC (rev 4870) +++ trunk/nhibernate/src/NHibernate.Test/CfgTest/HbmBinderFixture.cs 2009-11-29 12:56:53 UTC (rev 4871) @@ -1,59 +0,0 @@ -using System; -using System.IO; -using System.Xml; -using NHibernate.Cfg; -using NHibernate.Cfg.XmlHbmBinding; -using NHibernate.Mapping; -using NUnit.Framework; - -namespace NHibernate.Test.CfgTest -{ - [TestFixture] - public class HbmBinderFixture - { - private XmlDocument LoadAndValidate(string xml, string name) - { - using (StringReader stringReader = new StringReader(xml)) - { - XmlTextReader xmlReader = new XmlTextReader(stringReader); - Configuration cfg = new Configuration(); - return cfg.LoadMappingDocument(xmlReader, name).Document; - } - } - - private string GetXmlForTesting(string versionTag) - { - string XML_TEMPLATE = - @"<?xml version='1.0' ?> -<hibernate-mapping xmlns='urn:nhibernate-mapping-2.2'> - <class name='class'> - <id column='id'> - <generator class='generator' /> - </id> - <{0} name='{0}' /> - </class> -</hibernate-mapping>"; - - return String.Format(XML_TEMPLATE, versionTag); - } - - private void CheckDefaultUnsavedValue(string versionTag) - { - string XML = GetXmlForTesting(versionTag); - XmlDocument document = LoadAndValidate(XML, versionTag); - XmlNode node = document.GetElementsByTagName(versionTag)[0]; - SimpleValue model = new SimpleValue(); - RootClassBinder.MakeVersion(node, model); - Assert.IsNull(model.NullValue, - "default unsaved-value for tag {0} should be null, but is '{1}'", - versionTag, model.NullValue); - } - - [Test] - public void DefaultUnsavedValueIsUndefined() - { - CheckDefaultUnsavedValue("version"); - CheckDefaultUnsavedValue("timestamp"); - } - } -} \ No newline at end of file Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj =================================================================== --- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-11-29 12:48:34 UTC (rev 4870) +++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2009-11-29 12:56:53 UTC (rev 4871) @@ -113,7 +113,6 @@ <Compile Include="CfgTest\ConfigurationSerializationTests.cs" /> <Compile Include="CfgTest\DefaultNsAssmFixture.cs" /> <Compile Include="CfgTest\EntityCacheUsageParserFixture.cs" /> - <Compile Include="CfgTest\HbmBinderFixture.cs" /> <Compile Include="CfgTest\HbmOrderingFixture.cs" /> <Compile Include="CfgTest\LocatedInTestAssembly.cs" /> <Compile Include="CfgTest\Loquacious\ConfigurationFixture.cs" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |