Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[5628] trunk/nhibernate/src/NHibernate.Test
|
From: <fab...@us...> - 2011-04-06 21:06:36
|
Revision: 5628
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5628&view=rev
Author: fabiomaulo
Date: 2011-04-06 21:06:29 +0000 (Wed, 06 Apr 2011)
Log Message:
-----------
Fixed test to be only dyn-proxy test
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/Fixture.cs
trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
Added Paths:
-----------
trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/PassThroughInterceptor.cs
Removed Paths:
-------------
trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/ClassWithVarietyOfMembers.cs
trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/Mapping.hbm.xml
Added: trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/PassThroughInterceptor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/PassThroughInterceptor.cs (rev 0)
+++ trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/PassThroughInterceptor.cs 2011-04-06 21:06:29 UTC (rev 5628)
@@ -0,0 +1,20 @@
+using System;
+using NHibernate.Proxy.DynamicProxy;
+
+namespace NHibernate.Test.DynamicProxyTests
+{
+ public class PassThroughInterceptor : NHibernate.Proxy.DynamicProxy.IInterceptor
+ {
+ private readonly object targetInstance;
+
+ public PassThroughInterceptor(object targetInstance)
+ {
+ this.targetInstance = targetInstance;
+ }
+
+ public object Intercept(InvocationInfo info)
+ {
+ return info.TargetMethod.Invoke(targetInstance, info.Arguments);
+ }
+ }
+}
\ No newline at end of file
Deleted: trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/ClassWithVarietyOfMembers.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/ClassWithVarietyOfMembers.cs 2011-04-06 18:11:14 UTC (rev 5627)
+++ trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/ClassWithVarietyOfMembers.cs 2011-04-06 21:06:29 UTC (rev 5628)
@@ -1,20 +0,0 @@
-using System;
-
-namespace NHibernate.Test.DynamicProxyTests.ProxiedMembers
-{
- public class ClassWithVarietyOfMembers
- {
- public virtual int Id { get; set; }
- public virtual string Data { get; set; }
-
- public virtual void Method1(out int x)
- {
- x = 3;
- }
-
- public virtual void Method2(ref int x)
- {
- x++;
- }
- }
-}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/Fixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/Fixture.cs 2011-04-06 18:11:14 UTC (rev 5627)
+++ trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/Fixture.cs 2011-04-06 21:06:29 UTC (rev 5628)
@@ -1,50 +1,38 @@
-using System;
-using System.Collections;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
+using NHibernate.Proxy.DynamicProxy;
using NUnit.Framework;
+using SharpTestsEx;
namespace NHibernate.Test.DynamicProxyTests.ProxiedMembers
{
- [TestFixture]
- public class Fixture : TestCase
+ public class ClassWithVarietyOfMembers
{
- protected override IList Mappings
+ public virtual void Method1(out int x)
{
- get { return new[] { "DynamicProxyTests.ProxiedMembers.Mapping.hbm.xml" }; }
+ x = 3;
}
- protected override string MappingsAssembly
+ public virtual void Method2(ref int x)
{
- get { return "NHibernate.Test"; }
+ x++;
}
+ }
+ public class Fixture
+ {
[Test]
- [Ignore]
+ [Ignore]
public void Proxy()
{
- ISession s = OpenSession();
- ClassWithVarietyOfMembers c = new ClassWithVarietyOfMembers {Id = 1, Data = "some data"};
- s.Save(c);
- s.Flush();
- s.Close();
+ var factory = new ProxyFactory();
+ var c = (ClassWithVarietyOfMembers)factory.CreateProxy(typeof(ClassWithVarietyOfMembers), new PassThroughInterceptor(new ClassWithVarietyOfMembers()), null);
- s = OpenSession();
- c = (ClassWithVarietyOfMembers)s.Load(typeof(ClassWithVarietyOfMembers), c.Id);
- Assert.IsFalse(NHibernateUtil.IsInitialized(c));
+ int x;
+ c.Method1(out x);
+ x.Should().Be(3);
- int x;
- c.Method1(out x);
- Assert.AreEqual(3, x);
-
- x = 4;
- c.Method2(ref x);
- Assert.AreEqual(5, x);
-
- s.Delete(c);
- s.Flush();
- s.Close();
+ x = 4;
+ c.Method2(ref x);
+ x.Should().Be(5);
}
}
}
\ No newline at end of file
Deleted: trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/Mapping.hbm.xml
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/Mapping.hbm.xml 2011-04-06 18:11:14 UTC (rev 5627)
+++ trunk/nhibernate/src/NHibernate.Test/DynamicProxyTests/ProxiedMembers/Mapping.hbm.xml 2011-04-06 21:06:29 UTC (rev 5628)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
- assembly="NHibernate.Test"
- namespace="NHibernate.Test.DynamicProxyTests.ProxiedMembers">
- <class name="ClassWithVarietyOfMembers">
- <id name="Id">
- <generator class="assigned" />
- </id>
- <property name="Data" />
- </class>
-</hibernate-mapping>
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-06 18:11:14 UTC (rev 5627)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj 2011-04-06 21:06:29 UTC (rev 5628)
@@ -222,7 +222,7 @@
<Compile Include="DynamicProxyTests\InterfaceProxySerializationTests\ProxyFixture.cs" />
<Compile Include="DynamicProxyTests\InterfaceWithEqualsGethashcodeTests.cs" />
<Compile Include="DynamicProxyTests\LazyFieldInterceptorSerializable.cs" />
- <Compile Include="DynamicProxyTests\ProxiedMembers\ClassWithVarietyOfMembers.cs" />
+ <Compile Include="DynamicProxyTests\PassThroughInterceptor.cs" />
<Compile Include="DynamicProxyTests\ProxiedMembers\Fixture.cs" />
<Compile Include="EngineTest\CallableParserFixture.cs" />
<Compile Include="EngineTest\NativeSQLQueryNonScalarReturnTest.cs" />
@@ -2548,7 +2548,6 @@
<EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="DynamicProxyTests\ProxiedMembers\Mapping.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\SqlConverterAndMultiQuery\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH2489\Mappings.hbm.xml" />
<EmbeddedResource Include="NHSpecificTest\NH2603\Mappings.hbm.xml" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
