Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed "net 1.0 does not support "internal virtual" members"

Browse Source 
polishing
This commit is contained in:
eeichinger
2009-03-03 03:03:17 +00:00
parent 587964d20e
commit a7d6463105
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/Spring/Spring.Aop.Tests/Aop/Framework/DynamicProxy/InheritanceAopProxyTests.cs
View File

@@ -205,6 +205,7 @@ namespace Spring.Aop.Framework.DynamicProxy
Assert.AreEqual(3, ni.Count);
}
#if !NET_1_0
[Test]
public void DoesNotInterceptInternalMethod()
{
@@ -222,6 +223,7 @@ namespace Spring.Aop.Framework.DynamicProxy
proxiedClass.InternalToDo();
Assert.AreEqual(0, ni.Count);
}
#endif
[Test]
public void InterceptVirtualMethodThatBelongsToAnInterface()
@@ -405,11 +407,16 @@ namespace Spring.Aop.Framework.DynamicProxy
}
#if !NET_1_0
// "internal virtual" is not supported on net 1.0 CLR
// see http://support.microsoft.com/?scid=kb%3Ben-us%3B317129&x=11&y=12
internal virtual void InternalToDo()
{
}
#endif
internal protected virtual void InternalProtectedToDo()
{

19
test/Spring/Spring.Data.NHibernate.Tests/Data/NHibernate/Config/AopConfiguration.cs
View File

@@ -42,13 +42,18 @@ namespace Spring.Data.NHibernate.Config
[SetUp]
public void Setup()
{
#if NH_2_1
ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
#elif NH_2_0
ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
#else
ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
#endif
string aopConfigPath =
string.Format(
"assembly://{0}/Spring.Data.NHibernate.Config/AopConfiguration.xml"
, this.GetType().Assembly.GetName().Name);
ctx = new XmlApplicationContext(aopConfigPath);
//#if NH_2_1
// ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate21.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
//#elif NH_2_0
// ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate20.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
//#else
// ctx = new XmlApplicationContext("assembly://Spring.Data.NHibernate.Tests/Spring.Data.NHibernate.Config/AopConfiguration.xml");
//#endif
}