From: <fab...@us...> - 2008-11-07 04:49:47
|
Revision: 3891 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=3891&view=rev Author: fabiomaulo Date: 2008-11-07 04:49:41 +0000 (Fri, 07 Nov 2008) Log Message: ----------- Created NHibernate.ProxyGenerators.LinFuDynamicProxy Modified Paths: -------------- trunk/nhibernate/default.build trunk/nhibernate/src/NHibernate.sln Added Paths: ----------- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/LazyInitializer.cs trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/NHibernate.ProxyGenerators.LinFuDynamicProxy.csproj trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/Properties/ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyFactory.cs trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyFactoryFactory.cs trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyGenerators.build trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/app.config trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/App.config trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/DebugConnectionProvider.cs trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests.csproj trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/Properties/ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyGenerators.Test.build trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/IMyProxy.cs trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/MyProxyImpl.cs trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/ProxyFixture.cs trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/ProxyImpl.hbm.xml trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/TestCase.cs trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/TestConfigurationHelper.cs Modified: trunk/nhibernate/default.build =================================================================== --- trunk/nhibernate/default.build 2008-11-07 04:47:41 UTC (rev 3890) +++ trunk/nhibernate/default.build 2008-11-07 04:49:41 UTC (rev 3891) @@ -26,6 +26,8 @@ <include name="Iesi.Collections/Iesi.Collections.build" /> <include name="Iesi.Collections.Test/Iesi.Collections.Test.build" /> <include name="NHibernate/NHibernate.build" /> + <include name="NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyGenerators.build" /> + <include name="NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyGenerators.Test.build" /> <include name="NHibernate.ProxyGenerators.CastleDynamicProxy/ProxyGenerators.build" /> <include name="NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyGenerators.Test.build" /> <include name="NHibernate.DomainModel/NHibernate.DomainModel.build" /> @@ -37,6 +39,7 @@ <fileset id="buildfiles.tests" basedir="src"> <include name="Iesi.Collections.Test/Iesi.Collections.Test.build" /> + <include name="NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyGenerators.Test.build" /> <include name="NHibernate.ProxyGenerators.CastleDynamicProxy.Tests/ProxyGenerators.Test.build" /> <include name="NHibernate.Test/NHibernate.Test.build" /> <include name="NHibernate.Test.Performance/NHibernate.Test.Performance.build" @@ -86,6 +89,8 @@ --> <exclude name="Iesi.Collections.dll" /> <exclude name="Iesi.Collections.xml" /> + <exclude name="NHibernate.ProxyGenerators.LinFuDynamicProxy.dll" /> + <exclude name="NHibernate.ProxyGenerators.LinFuDynamicProxy.xml" /> <exclude name="NHibernate.ProxyGenerators.CastleDynamicProxy.dll" /> <exclude name="NHibernate.ProxyGenerators.CastleDynamicProxy.xml" /> <include name="*.dll" /> Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy ___________________________________________________________________ Added: svn:ignore + [Bb]in obj [Dd]ebug [Rr]elease *.user *.aps *.eto *resharper* AssemblyInfo.cs Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/LazyInitializer.cs =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/LazyInitializer.cs (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/LazyInitializer.cs 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,49 @@ +using System; +using System.Reflection; +using LinFu.DynamicProxy; +using NHibernate.Engine; +using NHibernate.Proxy.Poco; +using NHibernate.Type; + +namespace NHibernate.ProxyGenerators.LinFuDynamicProxy +{ + [Serializable] + public class LazyInitializer : BasicLazyInitializer, LinFu.DynamicProxy.IInterceptor + { + private static readonly MethodInfo exceptionInternalPreserveStackTrace = + typeof (Exception).GetMethod("InternalPreserveStackTrace", BindingFlags.Instance | BindingFlags.NonPublic); + + public LazyInitializer(string entityName, System.Type persistentClass, object id, MethodInfo getIdentifierMethod, + MethodInfo setIdentifierMethod, IAbstractComponentType componentIdType, + ISessionImplementor session) + : base(entityName, persistentClass, id, getIdentifierMethod, setIdentifierMethod, componentIdType, session) {} + + #region Implementation of IInterceptor + + public object Intercept(InvocationInfo info) + { + object returnValue; + try + { + returnValue = base.Invoke(info.TargetMethod, info.Arguments, info.Target); + + // Avoid invoking the actual implementation, if possible + if (returnValue != InvokeImplementation) + { + return returnValue; + } + + returnValue = info.TargetMethod.Invoke(GetImplementation(), info.Arguments); + } + catch (TargetInvocationException ex) + { + exceptionInternalPreserveStackTrace.Invoke(ex.InnerException, new Object[] {}); + throw ex.InnerException; + } + + return returnValue; + } + + #endregion + } +} \ No newline at end of file Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/NHibernate.ProxyGenerators.LinFuDynamicProxy.csproj =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/NHibernate.ProxyGenerators.LinFuDynamicProxy.csproj (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/NHibernate.ProxyGenerators.LinFuDynamicProxy.csproj 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{8289D6AD-9714-42D3-A94D-D4D9814D1281}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>NHibernate.ProxyGenerators.LinFuDynamicProxy</RootNamespace> + <AssemblyName>NHibernate.ProxyGenerators.LinFuDynamicProxy</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <TargetFrameworkSubset> + </TargetFrameworkSubset> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath> + </Reference> + <Reference Include="LinFu.DynamicProxy, Version=1.0.3232.29886, Culture=neutral, PublicKeyToken=62a6874124340d6e, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\lib\net\2.0\LinFu.DynamicProxy.dll</HintPath> + </Reference> + <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\lib\net\3.5\log4net.dll</HintPath> + </Reference> + <Reference Include="System" /> + </ItemGroup> + <ItemGroup> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="LazyInitializer.cs" /> + <Compile Include="ProxyFactory.cs" /> + <Compile Include="ProxyFactoryFactory.cs" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\NHibernate\NHibernate.csproj"> + <Project>{5909BFE7-93CF-4E5F-BE22-6293368AF01D}</Project> + <Name>NHibernate</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <None Include="app.config" /> + <None Include="ProxyGenerators.build" /> + </ItemGroup> + <ItemGroup> + <Folder Include="Properties\" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> +</Project> \ No newline at end of file Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyFactory.cs =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyFactory.cs (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyFactory.cs 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,74 @@ +using System; +using System.Reflection; +using Iesi.Collections.Generic; +using log4net; +using NHibernate.Engine; +using NHibernate.Proxy; +using NHibernate.Type; + +namespace NHibernate.ProxyGenerators.LinFuDynamicProxy +{ + public class ProxyFactory : IProxyFactory + { + private static readonly LinFu.DynamicProxy.ProxyFactory factory = new LinFu.DynamicProxy.ProxyFactory(); + protected static readonly ILog log = LogManager.GetLogger(typeof (ProxyFactory)); + + protected System.Type PersistentClass { get; private set; } + + protected System.Type[] Interfaces { get; private set; } + + protected MethodInfo GetIdentifierMethod { get; private set; } + + public MethodInfo SetIdentifierMethod { get; private set; } + + protected IAbstractComponentType ComponentIdType { get; private set; } + + protected string EntityName { get; private set; } + + protected bool IsClassProxy + { + get { return Interfaces.Length == 1; } + } + + #region IProxyFactory Members + + public void PostInstantiate(string entityName, System.Type persistentClass, ISet<System.Type> interfaces, + MethodInfo getIdentifierMethod, MethodInfo setIdentifierMethod, + IAbstractComponentType componentIdType) + { + EntityName = entityName; + PersistentClass = persistentClass; + Interfaces = new System.Type[interfaces.Count]; + + if (interfaces.Count > 0) + { + interfaces.CopyTo(Interfaces, 0); + } + + GetIdentifierMethod = getIdentifierMethod; + SetIdentifierMethod = setIdentifierMethod; + ComponentIdType = componentIdType; + } + + public INHibernateProxy GetProxy(object id, ISessionImplementor session) + { + try + { + var initializer = new LazyInitializer(EntityName, PersistentClass, id, GetIdentifierMethod, SetIdentifierMethod, + ComponentIdType, session); + + object proxyInstance = IsClassProxy ? factory.CreateProxy(PersistentClass, initializer, Interfaces) + : factory.CreateProxy(Interfaces[0], initializer, Interfaces); + + return (INHibernateProxy) proxyInstance; + } + catch (Exception ex) + { + log.Error("Creating a proxy instance failed", ex); + throw new HibernateException("Creating a proxy instance failed", ex); + } + } + + #endregion + } +} \ No newline at end of file Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyFactoryFactory.cs =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyFactoryFactory.cs (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyFactoryFactory.cs 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,23 @@ +using NHibernate.Bytecode; +using NHibernate.Proxy; + +namespace NHibernate.ProxyGenerators.LinFuDynamicProxy +{ + public class ProxyFactoryFactory : IProxyFactoryFactory + { + #region IProxyFactoryFactory Members + + public IProxyFactory BuildProxyFactory() + { + return new ProxyFactory(); + } + + public IProxyValidator ProxyValidator + { + // TODO : LinFu need a specific proxy validator because need virtual methods even when we are using an interface as proxy + get { return new DynProxyTypeValidator(); } + } + + #endregion + } +} \ No newline at end of file Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyGenerators.build =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyGenerators.build (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/ProxyGenerators.build 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,36 @@ +<?xml version="1.0" ?> + +<project + name="NHibernate.ProxyGenerators.LinFuDynamicProxy" + default="build" + xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd" +> + + <property name="root.dir" value="../.." /> + <include buildfile="${root.dir}/build-common/common-project.xml" /> + + <target name="init" depends="common.init"> + + <property name="assembly.is-cls-compliant" value="true" /> + <property name="assembly.description" + value="LinFu Dynamic proxy generator adapters for NHibernate." /> + <property name="assembly.copyright" + value="Licensed under LGPL." /> + <property name="assembly.allow-partially-trusted-callers" value="true" /> + + <property name="clover.instrument" value="true" /> + + <assemblyfileset basedir="${bin.dir}" id="project.references"> + <include name="System.dll" /> + <include name="Iesi.Collections.dll" /> + <include name="log4net.dll" /> + <include name="LinFu.DynamicProxy.dll" /> + <include name="NHibernate.dll" /> + </assemblyfileset> + + </target> + + <target name="generate-assemblyinfo" depends="init common.generate-assemblyinfo" /> + <target name="build" depends="init generate-assemblyinfo common.compile-dll" description="Build LinFu ProxyGenerators" /> + +</project> Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/app.config =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/app.config (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy/app.config 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,3 @@ +<?xml version="1.0"?> +<configuration> +<startup><supportedRuntime version="v2.0.50727"/></startup></configuration> Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests ___________________________________________________________________ Added: svn:ignore + [Bb]in obj [Dd]ebug [Rr]elease *.user *.aps *.eto *resharper* hibernate.cfg.xml AssemblyInfo.cs Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/App.config =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/App.config (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/App.config 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,84 @@ +<?xml version="1.0"?> +<configuration> + <configSections> + <section name="hibernate-configuration" type="NHibernate.Cfg.ConfigurationSectionHandler, NHibernate"/> + <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net"/> + </configSections> + + <!-- + hibernate-configuration section + + You don't need to change this section for your own use. + You can write your own hibernate.cfg.xml to override all session-factory configuration. + Templates are available in NHibernate.Config.Templates folder. + --> + <hibernate-configuration xmlns="urn:nhibernate-configuration-2.2"> + <bytecode-provider type="lcg"/> + <reflection-optimizer use="true"/> + <session-factory name="NHibernate.Test"> + <property name="connection.provider">NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests.DebugConnectionProvider, NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests</property> + <property name="cache.provider_class">NHibernate.Cache.HashtableCacheProvider, NHibernate</property> + <property name="cache.use_query_cache">true</property> + <property name="prepare_sql">false</property> + <property name="query.startup_check">false</property> + <property name="connection.isolation">ReadCommitted</property> + <property name="connection.driver_class">NHibernate.Driver.SqlClientDriver</property> + <property name="connection.connection_string"> + Server=(local);initial catalog=nhibernate;Integrated Security=SSPI + </property> + <property name="show_sql">false</property> + <property name="dialect">NHibernate.Dialect.MsSql2005Dialect</property> + <property name="use_outer_join">true</property> + <property name="command_timeout">10</property> + <property name="query.substitutions">true 1, false 0, yes 'Y', no 'N'</property> + <property name="adonet.wrap_result_sets">false</property> + + <property name="proxyfactory.factory_class">NHibernate.ProxyGenerators.LinFuDynamicProxy.ProxyFactoryFactory, NHibernate.ProxyGenerators.LinFuDynamicProxy</property> + + </session-factory> + </hibernate-configuration> + + <!-- This section contains the log4net configuration settings --> + <log4net debug="false"> + + <!-- Define some output appenders --> + <appender name="trace" type="log4net.Appender.TraceAppender, log4net"> + <layout type="log4net.Layout.PatternLayout,log4net"> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n"/> + </layout> + </appender> + + <appender name="console" type="log4net.Appender.ConsoleAppender, log4net"> + <layout type="log4net.Layout.PatternLayout,log4net"> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p %c{1}:%L - %m%n"/> + </layout> + </appender> + + <appender name="rollingFile" type="log4net.Appender.RollingFileAppender,log4net"> + + <param name="File" value="log.txt"/> + <param name="AppendToFile" value="false"/> + <param name="RollingStyle" value="Date"/> + <param name="DatePattern" value="yyyy.MM.dd"/> + <param name="StaticLogFileName" value="true"/> + + <layout type="log4net.Layout.PatternLayout,log4net"> + <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/> + </layout> + </appender> + + <root> + <priority value="WARN"/> + <appender-ref ref="console"/> + </root> + <logger name="NHibernate.Proxy.Poco"> + <priority value="DEBUG"/> + </logger> + + <logger name="NHibernate.ProxyGenerators.LinFuDynamicProxy"> + <priority value="DEBUG"/> + </logger> + </log4net> + + +<startup><supportedRuntime version="v2.0.50727"/></startup></configuration> Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/DebugConnectionProvider.cs =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/DebugConnectionProvider.cs (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/DebugConnectionProvider.cs 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,68 @@ +using System.Collections; +using System.Data; +using Iesi.Collections; +using NHibernate.Connection; + +namespace NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests +{ + public class DebugConnectionProvider : DriverConnectionProvider + { + private readonly ISet connections = new ListSet(); + + public override IDbConnection GetConnection() + { + IDbConnection connection = base.GetConnection(); + connections.Add(connection); + return connection; + } + + public override void CloseConnection(IDbConnection conn) + { + base.CloseConnection(conn); + connections.Remove(conn); + } + + public bool HasOpenConnections + { + get + { + // check to see if all connections that were at one point opened + // have been closed through the CloseConnection + // method + if (connections.IsEmpty) + { + // there are no connections, either none were opened or + // all of the closings went through CloseConnection. + return false; + } + else + { + // Disposing of an ISession does not call CloseConnection (should it???) + // so a Diposed of ISession will leave an IDbConnection in the list but + // the IDbConnection will be closed (atleast with MsSql it works this way). + foreach (IDbConnection conn in connections) + { + if (conn.State != ConnectionState.Closed) + { + return true; + } + } + + // all of the connections have been Disposed and were closed that way + // or they were Closed through the CloseConnection method. + return false; + } + } + } + + public void CloseAllConnections() + { + while (!connections.IsEmpty) + { + IEnumerator en = connections.GetEnumerator(); + en.MoveNext(); + CloseConnection(en.Current as IDbConnection); + } + } + } +} \ No newline at end of file Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests.csproj =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests.csproj (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests.csproj 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>9.0.30729</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{94FDD99B-8275-4E51-8F43-958B2C632120}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests</RootNamespace> + <AssemblyName>NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests</AssemblyName> + <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <TargetFrameworkSubset> + </TargetFrameworkSubset> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="Iesi.Collections, Version=1.0.1.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\lib\net\3.5\Iesi.Collections.dll</HintPath> + </Reference> + <Reference Include="LinFu.DynamicProxy, Version=1.0.3232.29886, Culture=neutral, PublicKeyToken=62a6874124340d6e, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\lib\net\2.0\LinFu.DynamicProxy.dll</HintPath> + </Reference> + <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\lib\net\3.5\log4net.dll</HintPath> + </Reference> + <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\lib\net\3.5\nunit.framework.dll</HintPath> + </Reference> + <Reference Include="System" /> + <Reference Include="System.Data" /> + <Reference Include="System.XML" /> + </ItemGroup> + <ItemGroup> + <Compile Include="AssemblyInfo.cs" /> + <Compile Include="DebugConnectionProvider.cs" /> + <Compile Include="ProxyInterface\IMyProxy.cs" /> + <Compile Include="ProxyInterface\MyProxyImpl.cs" /> + <Compile Include="ProxyInterface\ProxyFixture.cs" /> + <Compile Include="TestCase.cs" /> + <Compile Include="TestConfigurationHelper.cs" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\NHibernate.ProxyGenerators.LinFuDynamicProxy\NHibernate.ProxyGenerators.LinFuDynamicProxy.csproj"> + <Project>{8289D6AD-9714-42D3-A94D-D4D9814D1281}</Project> + <Name>NHibernate.ProxyGenerators.LinFuDynamicProxy</Name> + </ProjectReference> + <ProjectReference Include="..\NHibernate\NHibernate.csproj"> + <Project>{5909BFE7-93CF-4E5F-BE22-6293368AF01D}</Project> + <Name>NHibernate</Name> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <EmbeddedResource Include="ProxyInterface\ProxyImpl.hbm.xml" /> + </ItemGroup> + <ItemGroup> + <None Include="App.config" /> + <None Include="ProxyGenerators.Test.build" /> + </ItemGroup> + <ItemGroup> + <Folder Include="Properties\" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> + <PropertyGroup> + <PostBuildEvent>if exist hibernate.cfg.xml (del hibernate.cfg.xml) +if exist "$(ProjectDir)hibernate.cfg.xml" (copy "$(ProjectDir)hibernate.cfg.xml" "hibernate.cfg.xml")</PostBuildEvent> + </PropertyGroup> +</Project> \ No newline at end of file Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyGenerators.Test.build =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyGenerators.Test.build (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyGenerators.Test.build 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,44 @@ +<?xml version="1.0" ?> + +<project + name="NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests" + default="build" + xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd" +> + + <property name="root.dir" value="../.." /> + + <include buildfile="${root.dir}/build-common/common-project.xml" /> + + <target name="init" depends="common.init"> + + <property name="assembly.is-cls-compliant" value="false" /> + <property name="assembly.description" value="The Unit Tests for LinFu ProxyGenerators." /> + <property name="assembly.version" value="1.0.0.1" /> + <property name="assembly.version.informational" value="1.0" /> + + <property name="clover.instrument" value="false" /> + + <assemblyfileset id="project.references" basedir="${bin.dir}"> + <include name="System.dll" /> + <include name="System.XML.dll" /> + <include name="System.Data.dll" /> + <include name="Iesi.Collections.dll" /> + <include name="log4net.dll" /> + <include name="LinFu.DynamicProxy.dll" /> + <include name="NHibernate.dll" /> + <include name="NHibernate.ProxyGenerators.LinFuDynamicProxy.dll" /> + <include name="nunit.framework.dll"/> + </assemblyfileset> + + <resourcefileset id="project.resources" prefix="NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests" dynamicprefix="true"> + <include name="**/*.xml" /> + <exclude name="bin/**/*.xml" /> + </resourcefileset> + </target> + + <target name="generate-assemblyinfo" depends="init common.generate-assemblyinfo" /> + <target name="build" depends="init generate-assemblyinfo common.compile-tests" /> + <target name="test" depends="init build common.run-tests" /> + +</project> Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/IMyProxy.cs =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/IMyProxy.cs (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/IMyProxy.cs 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,11 @@ +namespace NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests.ProxyInterface +{ + public interface IMyProxy + { + int Id { get; set; } + + string Name { get; set; } + + void ThrowDeepException(); + } +} \ No newline at end of file Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/MyProxyImpl.cs =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/MyProxyImpl.cs (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/MyProxyImpl.cs 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,30 @@ +using System; + +namespace NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests.ProxyInterface +{ + public class MyProxyImpl: IMyProxy + { + private static void Level1() + { + Level2(); + } + + private static void Level2() + { + throw new ArgumentException("thrown from Level2"); + } + + #region CastleProxy Members + + public int Id { get; set; } + + public string Name { get; set; } + + public void ThrowDeepException() + { + Level1(); + } + + #endregion + } +} \ No newline at end of file Property changes on: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/MyProxyImpl.cs ___________________________________________________________________ Added: svn:mergeinfo + Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/ProxyFixture.cs =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/ProxyFixture.cs (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/ProxyFixture.cs 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,137 @@ +using System; +using System.Collections; +using System.IO; +using System.Runtime.Serialization; +using System.Runtime.Serialization.Formatters.Binary; +using NUnit.Framework; + +namespace NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests.ProxyInterface +{ + [TestFixture] + public class ProxyFixture : TestCase + { + protected override IList Mappings + { + get { return new[] {"ProxyInterface.ProxyImpl.hbm.xml"}; } + } + + private void SerializeAndDeserialize(ref ISession s) + { + // Serialize the session + using (Stream stream = new MemoryStream()) + { + IFormatter formatter = new BinaryFormatter(); + formatter.Serialize(stream, s); + + // Close the original session + s.Close(); + + // Deserialize the session + stream.Position = 0; + s = (ISession) formatter.Deserialize(stream); + } + } + + [Test] + public void ExceptionStackTrace() + { + ISession s = OpenSession(); + IMyProxy ap = new MyProxyImpl {Id = 1, Name = "first proxy"}; + s.Save(ap); + s.Flush(); + s.Close(); + + s = OpenSession(); + ap = (IMyProxy) s.Load(typeof (MyProxyImpl), ap.Id); + Assert.IsFalse(NHibernateUtil.IsInitialized(ap), "check we have a proxy"); + + try + { + ap.ThrowDeepException(); + Assert.Fail("Exception not thrown"); + } + catch (ArgumentException ae) + { + Assert.AreEqual("thrown from Level2", ae.Message); + + string[] stackTraceLines = ae.StackTrace.Split('\n'); + Assert.IsTrue(stackTraceLines[0].Contains("Level2"), "top of exception stack is Level2()"); + Assert.IsTrue(stackTraceLines[1].Contains("Level1"), "next on exception stack is Level1()"); + } + finally + { + s.Delete(ap); + s.Flush(); + s.Close(); + } + } + + [Test] + public void Proxy() + { + ISession s = OpenSession(); + IMyProxy ap = new MyProxyImpl {Id = 1, Name = "first proxy"}; + s.Save(ap); + s.Flush(); + s.Close(); + + s = OpenSession(); + ap = (IMyProxy) s.Load(typeof (MyProxyImpl), ap.Id); + Assert.IsFalse(NHibernateUtil.IsInitialized(ap)); + int id = ap.Id; + Assert.IsFalse(NHibernateUtil.IsInitialized(ap), "get id should not have initialized it."); + string name = ap.Name; + Assert.IsTrue(NHibernateUtil.IsInitialized(ap), "get name should have initialized it."); + s.Delete(ap); + s.Flush(); + s.Close(); + } + + [Test] + public void ProxySerialize() + { + ISession s = OpenSession(); + IMyProxy ap = new MyProxyImpl {Id = 1, Name = "first proxy"}; + s.Save(ap); + s.Flush(); + s.Close(); + + s = OpenSession(); + ap = (IMyProxy) s.Load(typeof (MyProxyImpl), ap.Id); + Assert.AreEqual(1, ap.Id); + s.Disconnect(); + + SerializeAndDeserialize(ref s); + + s.Reconnect(); + s.Disconnect(); + + // serialize and then deserialize the session again - make sure Castle.DynamicProxy + // has no problem with serializing two times - earlier versions of it did. + SerializeAndDeserialize(ref s); + + s.Close(); + + s = OpenSession(); + s.Delete(ap); + s.Flush(); + s.Close(); + } + + [Test] + public void SerializeNotFoundProxy() + { + ISession s = OpenSession(); + // this does not actually exists in db + var notThere = (IMyProxy) s.Load(typeof (MyProxyImpl), 5); + Assert.AreEqual(5, notThere.Id); + s.Disconnect(); + + // serialize and then deserialize the session. + SerializeAndDeserialize(ref s); + + Assert.IsNotNull(s.Load(typeof (MyProxyImpl), 5), "should be proxy - even though it doesn't exists in db"); + s.Close(); + } + } +} \ No newline at end of file Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/ProxyImpl.hbm.xml =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/ProxyImpl.hbm.xml (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/ProxyInterface/ProxyImpl.hbm.xml 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" + assembly="NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests" + namespace="NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests.ProxyInterface"> + <class name="MyProxyImpl" proxy="IMyProxy"> + <id name="Id"> + <generator class="assigned" /> + </id> + + <property name="Name" /> + </class> +</hibernate-mapping> \ No newline at end of file Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/TestCase.cs =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/TestCase.cs (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/TestCase.cs 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,323 @@ +using System; +using System.Collections; +using System.Data; +using System.Reflection; +using log4net; +using log4net.Config; +using NHibernate.Cfg; +using NHibernate.Connection; +using NHibernate.Engine; +using NHibernate.Mapping; +using NHibernate.Tool.hbm2ddl; +using NHibernate.Type; +using NUnit.Framework; + +namespace NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests +{ + public abstract class TestCase + { + private const bool OutputDdl = false; + protected Configuration cfg; + protected ISessionFactoryImplementor sessions; + + private static readonly ILog log = LogManager.GetLogger(typeof(TestCase)); + + protected Dialect.Dialect Dialect + { + get { return NHibernate.Dialect.Dialect.GetDialect(cfg.Properties); } + } + + protected ISession lastOpenedSession; + private DebugConnectionProvider connectionProvider; + + /// <summary> + /// Mapping files used in the TestCase + /// </summary> + protected abstract IList Mappings { get; } + + /// <summary> + /// Assembly to load mapping files from (default is NHibernate.DomainModel). + /// </summary> + protected virtual string MappingsAssembly + { + get { return "NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests"; } + } + + static TestCase() + { + // Configure log4net here since configuration through an attribute doesn't always work. + XmlConfigurator.Configure(); + } + + /// <summary> + /// Creates the tables used in this TestCase + /// </summary> + [TestFixtureSetUp] + public void TestFixtureSetUp() + { + try + { + Configure(); + if (!AppliesTo(Dialect)) + { + Assert.Ignore(GetType() + " does not apply to " + Dialect); + } + + CreateSchema(); + BuildSessionFactory(); + } + catch (Exception e) + { + log.Error("Error while setting up the test fixture", e); + throw; + } + } + + /// <summary> + /// Removes the tables used in this TestCase. + /// </summary> + /// <remarks> + /// If the tables are not cleaned up sometimes SchemaExport runs into + /// Sql errors because it can't drop tables because of the FKs. This + /// will occur if the TestCase does not have the same hbm.xml files + /// included as a previous one. + /// </remarks> + [TestFixtureTearDown] + public void TestFixtureTearDown() + { + DropSchema(); + Cleanup(); + } + + protected virtual void OnSetUp() + { + } + + /// <summary> + /// Set up the test. This method is not overridable, but it calls + /// <see cref="OnSetUp" /> which is. + /// </summary> + [SetUp] + public void SetUp() + { + OnSetUp(); + } + + protected virtual void OnTearDown() + { + } + + /// <summary> + /// Checks that the test case cleans up after itself. This method + /// is not overridable, but it calls <see cref="OnTearDown" /> which is. + /// </summary> + [TearDown] + public void TearDown() + { + OnTearDown(); + + bool wasClosed = CheckSessionWasClosed(); + bool wasCleaned = CheckDatabaseWasCleaned(); + bool wereConnectionsClosed = CheckConnectionsWereClosed(); + bool fail = !wasClosed || !wasCleaned || !wereConnectionsClosed; + + if (fail) + { + Assert.Fail("Test didn't clean up after itself"); + } + } + + private bool CheckSessionWasClosed() + { + if (lastOpenedSession != null && lastOpenedSession.IsOpen) + { + log.Error("Test case didn't close a session, closing"); + lastOpenedSession.Close(); + return false; + } + + return true; + } + + private bool CheckDatabaseWasCleaned() + { + if (sessions.GetAllClassMetadata().Count == 0) + { + // Return early in the case of no mappings, also avoiding + // a warning when executing the HQL below. + return true; + } + + bool empty; + using (ISession s = sessions.OpenSession()) + { + IList objects = s.CreateQuery("from System.Object o").List(); + empty = objects.Count == 0; + } + + if (!empty) + { + log.Error("Test case didn't clean up the database after itself, re-creating the schema"); + DropSchema(); + CreateSchema(); + } + + return empty; + } + + private bool CheckConnectionsWereClosed() + { + if (connectionProvider == null || !connectionProvider.HasOpenConnections) + { + return true; + } + + log.Error("Test case didn't close all open connections, closing"); + connectionProvider.CloseAllConnections(); + return false; + } + + private void Configure() + { + cfg = new Configuration(); + if (TestConfigurationHelper.hibernateConfigFile != null) + cfg.Configure(TestConfigurationHelper.hibernateConfigFile); + + Assembly assembly = Assembly.Load(MappingsAssembly); + + foreach (string file in Mappings) + { + cfg.AddResource(MappingsAssembly + "." + file, assembly); + } + + Configure(cfg); + + ApplyCacheSettings(cfg); + } + + private void CreateSchema() + { + new SchemaExport(cfg).Create(OutputDdl, true); + } + + private void DropSchema() + { + new SchemaExport(cfg).Drop(OutputDdl, true); + } + + protected virtual void BuildSessionFactory() + { + sessions = (ISessionFactoryImplementor)cfg.BuildSessionFactory(); + connectionProvider = sessions.ConnectionProvider as DebugConnectionProvider; + } + + private void Cleanup() + { + sessions.Close(); + sessions = null; + connectionProvider = null; + lastOpenedSession = null; + cfg = null; + } + + public int ExecuteStatement(string sql) + { + if (cfg == null) + { + cfg = new Configuration(); + } + + using (IConnectionProvider prov = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties)) + { + IDbConnection conn = prov.GetConnection(); + + try + { + using (IDbTransaction tran = conn.BeginTransaction()) + using (IDbCommand comm = conn.CreateCommand()) + { + comm.CommandText = sql; + comm.Transaction = tran; + comm.CommandType = CommandType.Text; + int result = comm.ExecuteNonQuery(); + tran.Commit(); + return result; + } + } + finally + { + prov.CloseConnection(conn); + } + } + } + + protected ISessionFactoryImplementor Sfi + { + get { return sessions; } + } + + protected virtual ISession OpenSession() + { + lastOpenedSession = sessions.OpenSession(); + return lastOpenedSession; + } + + protected virtual ISession OpenSession(IInterceptor sessionLocalInterceptor) + { + lastOpenedSession = sessions.OpenSession(sessionLocalInterceptor); + return lastOpenedSession; + } + + protected void ApplyCacheSettings(Configuration configuration) + { + if (CacheConcurrencyStrategy == null) + { + return; + } + + foreach (PersistentClass clazz in configuration.ClassMappings) + { + bool hasLob = false; + foreach (Property prop in clazz.PropertyClosureIterator) + { + if (prop.Value.IsSimpleValue) + { + IType type = ((SimpleValue)prop.Value).Type; + if (type == NHibernateUtil.BinaryBlob) + { + hasLob = true; + } + } + } + if (!hasLob && !clazz.IsInherited) + { + configuration.SetCacheConcurrencyStrategy(clazz.EntityName, CacheConcurrencyStrategy); + } + } + + foreach (Mapping.Collection coll in configuration.CollectionMappings) + { + configuration.SetCollectionCacheConcurrencyStrategy(coll.Role, CacheConcurrencyStrategy); + } + } + + #region Properties overridable by subclasses + + protected virtual bool AppliesTo(Dialect.Dialect dialect) + { + return true; + } + + protected virtual void Configure(Configuration configuration) + { + } + + protected virtual string CacheConcurrencyStrategy + { + get { return "nonstrict-read-write"; } + //get { return null; } + } + + #endregion + } +} \ No newline at end of file Added: trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/TestConfigurationHelper.cs =================================================================== --- trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/TestConfigurationHelper.cs (rev 0) +++ trunk/nhibernate/src/NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests/TestConfigurationHelper.cs 2008-11-07 04:49:41 UTC (rev 3891) @@ -0,0 +1,40 @@ +using System; +using System.IO; +using NHibernate.Cfg; + +namespace NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests +{ + public static class TestConfigurationHelper + { + public static readonly string hibernateConfigFile; + + static TestConfigurationHelper() + { + // Verify if hibernate.cfg.xml exists + hibernateConfigFile = GetDefaultConfigurationFilePath(); + } + + public static string GetDefaultConfigurationFilePath() + { + string baseDir = AppDomain.CurrentDomain.BaseDirectory; + string relativeSearchPath = AppDomain.CurrentDomain.RelativeSearchPath; + string binPath = relativeSearchPath == null ? baseDir : Path.Combine(baseDir, relativeSearchPath); + string fullPath = Path.Combine(binPath, Configuration.DefaultHibernateCfgFileName); + return File.Exists(fullPath) ? fullPath : null; + } + + /// <summary> + /// Standar Configuration for tests. + /// </summary> + /// <returns>The configuration using merge between App.Config and hibernate.cfg.xml if present.</returns> + public static Configuration GetDefaultConfiguration() + { + var result = new Configuration(); + if (hibernateConfigFile != null) + { + result.Configure(hibernateConfigFile); + } + return result; + } + } +} \ No newline at end of file Modified: trunk/nhibernate/src/NHibernate.sln =================================================================== --- trunk/nhibernate/src/NHibernate.sln 2008-11-07 04:47:41 UTC (rev 3890) +++ trunk/nhibernate/src/NHibernate.sln 2008-11-07 04:49:41 UTC (rev 3891) @@ -16,6 +16,10 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ProxyGenerators.CastleDynamicProxy.Tests", "NHibernate.ProxyGenerators.CastleDynamicProxy.Tests\NHibernate.ProxyGenerators.CastleDynamicProxy.Tests.csproj", "{4972EE96-2417-4D47-9FF1-3B1D6B1D3191}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ProxyGenerators.LinFuDynamicProxy", "NHibernate.ProxyGenerators.LinFuDynamicProxy\NHibernate.ProxyGenerators.LinFuDynamicProxy.csproj", "{8289D6AD-9714-42D3-A94D-D4D9814D1281}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests", "NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests\NHibernate.ProxyGenerators.LinFuDynamicProxy.Tests.csproj", "{94FDD99B-8275-4E51-8F43-958B2C632120}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -42,6 +46,14 @@ {4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Debug|Any CPU.Build.0 = Debug|Any CPU {4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Release|Any CPU.ActiveCfg = Release|Any CPU {4972EE96-2417-4D47-9FF1-3B1D6B1D3191}.Release|Any CPU.Build.0 = Release|Any CPU + {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8289D6AD-9714-42D3-A94D-D4D9814D1281}.Release|Any CPU.Build.0 = Release|Any CPU + {94FDD99B-8275-4E51-8F43-958B2C632120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {94FDD99B-8275-4E51-8F43-958B2C632120}.Debug|Any CPU.Build.0 = Debug|Any CPU + {94FDD99B-8275-4E51-8F43-958B2C632120}.Release|Any CPU.ActiveCfg = Release|Any CPU + {94FDD99B-8275-4E51-8F43-958B2C632120}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |