Author: hammett
Date: Tue Sep 28 19:41:10 2004
New Revision: 47446
Removed:
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/AssemblyInfo.cs
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/Builder/
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/DynamicProxy.sln
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/IInvocationHandler.cs
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/ProxyGenerator.cs
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/StandardInvocationHandler.cs
Modified:
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/ (props
changed)
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/AssemblyInfo.cs
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/DynamicProxy.sln
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/
(props changed)
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CustomProxyGeneratorTestCase.cs
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ProxyGeneratorTestCase.cs
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/SerializableClassTestCase.cs
Log:
Reorganization finished. New build system to go.
Modified:
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
==============================================================================
---
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
(original)
+++
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/Apache.Avalon.DynamicProxy.csproj
Tue Sep 28 19:41:10 2004
@@ -48,7 +48,7 @@
BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
- DefineConstants = "TRACE"
+ DefineConstants = "TRACE STRONG"
DocumentationFile = ""
DebugSymbols = "false"
FileAlignment = "4096"
Modified:
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/AssemblyInfo.cs
==============================================================================
---
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/AssemblyInfo.cs
(original)
+++
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/AssemblyInfo.cs
Tue Sep 28 19:41:10 2004
@@ -23,10 +23,10 @@
[assembly: AssemblyCopyright("Copyright (c) 2004 The Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyVersion("1.0.0.2")]
#if STRONG
[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("../../../../ApacheAvalon.snk")]
+[assembly: AssemblyKeyFile("../../../../../ApacheAvalon.snk")]
[assembly: AssemblyKeyName("")]
#endif
Modified:
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/DynamicProxy.sln
==============================================================================
---
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/DynamicProxy.sln
(original)
+++
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxy/DynamicProxy.sln
Tue Sep 28 19:41:10 2004
@@ -3,7 +3,7 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") =
"Apache.Avalon.DynamicProxy.Test",
"DynamicProxyTest\Apache.Avalon.DynamicProxy.Test.csproj",
"{EF89321E-FB2A-41B6-85B3-794D50A55CF1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") =
"Apache.Avalon.DynamicProxy.Test",
"..\DynamicProxyTest\Apache.Avalon.DynamicProxy.Test.csproj",
"{EF89321E-FB2A-41B6-85B3-794D50A55CF1}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Modified:
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj
==============================================================================
---
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj
(original)
+++
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/Apache.Avalon.DynamicProxy.Test.csproj
Tue Sep 28 19:41:10 2004
@@ -80,15 +80,15 @@
HintPath =
"C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
/>
<Reference
- Name = "DProxy"
- Project = "{70EE6AF2-1F6D-4CC5-A1B2-C3182F035F67}"
- Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
- />
- <Reference
Name = "nunit.framework"
AssemblyName = "nunit.framework"
HintPath =
"..\..\..\..\..\..\dotnet\NUnit22\bin\nunit.framework.dll"
AssemblyFolderKey = "hklm\dn\nunit.framework"
+ />
+ <Reference
+ Name = "Apache.Avalon.DynamicProxy"
+ Project = "{70EE6AF2-1F6D-4CC5-A1B2-C3182F035F67}"
+ Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
/>
</References>
</Build>
Modified:
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CustomProxyGeneratorTestCase.cs
==============================================================================
---
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CustomProxyGeneratorTestCase.cs
(original)
+++
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/CustomProxyGeneratorTestCase.cs
Tue Sep 28 19:41:10 2004
@@ -26,7 +26,7 @@
/// Summary description for CustomProxyGeneratorTestCase.
/// </summary>
[TestFixture]
- public class CustomProxyGeneratorTestCase : Assertion
+ public class CustomProxyGeneratorTestCase
{
private ProxyGenerator m_generator;
private bool m_enhanceInvoked;
@@ -51,8 +51,8 @@
typeof (IMyInterface),
new StandardInvocationHandler(new MyInterfaceImpl()),
context);
- Assert( m_enhanceInvoked );
- Assert( m_screenInvoked );
+ Assert.IsTrue( m_enhanceInvoked );
+ Assert.IsTrue( m_screenInvoked );
}
[Test]
@@ -67,26 +67,26 @@
new StandardInvocationHandler(new ServiceClass()),
context);
- Assert( m_enhanceInvoked );
- Assert( m_screenInvoked );
+ Assert.IsTrue( m_enhanceInvoked );
+ Assert.IsTrue( m_screenInvoked );
}
private void EnhanceType(TypeBuilder mainType, FieldBuilder
handlerFieldBuilder, ConstructorBuilder constructorBuilder)
{
- Assert( !m_enhanceInvoked );
+ Assert.IsTrue( !m_enhanceInvoked );
- AssertNotNull(mainType);
- AssertNotNull(handlerFieldBuilder);
- AssertNotNull(constructorBuilder);
+ Assert.IsNotNull(mainType);
+ Assert.IsNotNull(handlerFieldBuilder);
+ Assert.IsNotNull(constructorBuilder);
m_enhanceInvoked = true;
}
private Type[] ScreenInterfaces(Type[] interfaces)
{
- Assert( !m_screenInvoked );
+ Assert.IsTrue( !m_screenInvoked );
- AssertNotNull(interfaces);
+ Assert.IsNotNull(interfaces);
m_screenInvoked = true;
Modified:
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ProxyGeneratorTestCase.cs
==============================================================================
---
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ProxyGeneratorTestCase.cs
(original)
+++
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/ProxyGeneratorTestCase.cs
Tue Sep 28 19:41:10 2004
@@ -27,7 +27,7 @@
/// Summary description for ProxyGeneratorTestCase.
/// </summary>
[TestFixture]
- public class ProxyGeneratorTestCase : Assertion
+ public class ProxyGeneratorTestCase
{
private ProxyGenerator m_generator;
@@ -43,13 +43,13 @@
object proxy = m_generator.CreateClassProxy(
typeof(ServiceClass), new
ResultModifiedInvocationHandler( new ServiceClass() ) );
- AssertNotNull( proxy );
- Assert( typeof(ServiceClass).IsAssignableFrom( proxy.GetType()
) );
+ Assert.IsNotNull( proxy );
+ Assert.IsTrue( typeof(ServiceClass).IsAssignableFrom(
proxy.GetType() ) );
ServiceClass inter = (ServiceClass) proxy;
- AssertEquals( 44, inter.Sum( 20, 25 ) );
- AssertEquals( true, inter.Valid );
+ Assert.AreEqual( 44, inter.Sum( 20, 25 ) );
+ Assert.AreEqual( true, inter.Valid );
}
[Test]
@@ -58,15 +58,15 @@
object proxy = m_generator.CreateClassProxy(
typeof(SpecializedServiceClass), new
ResultModifiedInvocationHandler( new SpecializedServiceClass() ) );
- AssertNotNull( proxy );
- Assert( typeof(ServiceClass).IsAssignableFrom( proxy.GetType()
) );
- Assert( typeof(SpecializedServiceClass).IsAssignableFrom(
proxy.GetType() ) );
+ Assert.IsNotNull( proxy );
+ Assert.IsTrue( typeof(ServiceClass).IsAssignableFrom(
proxy.GetType() ) );
+ Assert.IsTrue(
typeof(SpecializedServiceClass).IsAssignableFrom( proxy.GetType() ) );
SpecializedServiceClass inter = (SpecializedServiceClass)
proxy;
- AssertEquals( 44, inter.Sum( 20, 25 ) );
- AssertEquals( -6, inter.Subtract( 20, 25 ) );
- AssertEquals( true, inter.Valid );
+ Assert.AreEqual( 44, inter.Sum( 20, 25 ) );
+ Assert.AreEqual( -6, inter.Subtract( 20, 25 ) );
+ Assert.AreEqual( true, inter.Valid );
}
[Test]
@@ -75,13 +75,13 @@
object proxy = m_generator.CreateClassProxy(
typeof(MyInterfaceImpl), new
ResultModifiedInvocationHandler( new MyInterfaceImpl() ) );
- AssertNotNull( proxy );
- Assert( typeof(MyInterfaceImpl).IsAssignableFrom(
proxy.GetType() ) );
- Assert( typeof(IMyInterface).IsAssignableFrom( proxy.GetType()
) );
+ Assert.IsNotNull( proxy );
+ Assert.IsTrue( typeof(MyInterfaceImpl).IsAssignableFrom(
proxy.GetType() ) );
+ Assert.IsTrue( typeof(IMyInterface).IsAssignableFrom(
proxy.GetType() ) );
IMyInterface inter = (IMyInterface) proxy;
- AssertEquals( 44, inter.Calc( 20, 25 ) );
+ Assert.AreEqual( 44, inter.Calc( 20, 25 ) );
}
[Test]
@@ -90,12 +90,12 @@
object proxy = m_generator.CreateClassProxy(
typeof(NoVirtualMethodClass), new
ResultModifiedInvocationHandler( new SpecializedServiceClass() ) );
- AssertNotNull( proxy );
- Assert( typeof(NoVirtualMethodClass).IsAssignableFrom(
proxy.GetType() ) );
+ Assert.IsNotNull( proxy );
+ Assert.IsTrue( typeof(NoVirtualMethodClass).IsAssignableFrom(
proxy.GetType() ) );
NoVirtualMethodClass inter = (NoVirtualMethodClass) proxy;
- AssertEquals( 45, inter.Sum( 20, 25 ) );
+ Assert.AreEqual( 45, inter.Sum( 20, 25 ) );
}
[Test]
@@ -104,12 +104,12 @@
object proxy = m_generator.CreateClassProxy(
typeof(SealedMethodsClass), new
ResultModifiedInvocationHandler( new SpecializedServiceClass() ) );
- AssertNotNull( proxy );
- Assert( typeof(SealedMethodsClass).IsAssignableFrom(
proxy.GetType() ) );
+ Assert.IsNotNull( proxy );
+ Assert.IsTrue( typeof(SealedMethodsClass).IsAssignableFrom(
proxy.GetType() ) );
SealedMethodsClass inter = (SealedMethodsClass) proxy;
- AssertEquals( 45, inter.Sum( 20, 25 ) );
+ Assert.AreEqual( 45, inter.Sum( 20, 25 ) );
}
[Test]
@@ -152,18 +152,18 @@
object proxy = m_generator.CreateProxy(
typeof(IMyInterface), new StandardInvocationHandler(
new MyInterfaceImpl() ) );
- AssertNotNull( proxy );
- Assert( typeof(IMyInterface).IsAssignableFrom( proxy.GetType()
) );
+ Assert.IsNotNull( proxy );
+ Assert.IsTrue( typeof(IMyInterface).IsAssignableFrom(
proxy.GetType() ) );
IMyInterface inter = (IMyInterface) proxy;
- AssertEquals( 45, inter.Calc( 20, 25 ) );
+ Assert.AreEqual( 45, inter.Calc( 20, 25 ) );
inter.Name = "opa";
- AssertEquals( "opa", inter.Name );
+ Assert.AreEqual( "opa", inter.Name );
inter.Started = true;
- AssertEquals( true, inter.Started );
+ Assert.AreEqual( true, inter.Started );
}
[Test]
@@ -172,20 +172,20 @@
object proxy = m_generator.CreateProxy(
typeof(IMySecondInterface), new
StandardInvocationHandler( new MySecondInterfaceImpl() ) );
- AssertNotNull( proxy );
- Assert( typeof(IMyInterface).IsAssignableFrom( proxy.GetType()
) );
- Assert( typeof(IMySecondInterface).IsAssignableFrom(
proxy.GetType() ) );
+ Assert.IsNotNull( proxy );
+ Assert.IsTrue( typeof(IMyInterface).IsAssignableFrom(
proxy.GetType() ) );
+ Assert.IsTrue( typeof(IMySecondInterface).IsAssignableFrom(
proxy.GetType() ) );
IMySecondInterface inter = (IMySecondInterface) proxy;
inter.Calc(1, 1);
inter.Name = "hammett";
- AssertEquals( "hammett", inter.Name );
+ Assert.AreEqual( "hammett", inter.Name );
inter.Address = "pereira leite, 44";
- AssertEquals( "pereira leite, 44", inter.Address );
+ Assert.AreEqual( "pereira leite, 44", inter.Address );
- AssertEquals( 45, inter.Calc( 20, 25 ) );
+ Assert.AreEqual( 45, inter.Calc( 20, 25 ) );
}
[Test]
@@ -196,14 +196,14 @@
object proxy = m_generator.CreateProxy(
typeof(IServiceStatus), new StandardInvocationHandler(
service ) );
- AssertNotNull( proxy );
- Assert( typeof(IServiceStatus).IsAssignableFrom(
proxy.GetType() ) );
+ Assert.IsNotNull( proxy );
+ Assert.IsTrue( typeof(IServiceStatus).IsAssignableFrom(
proxy.GetType() ) );
IServiceStatus inter = (IServiceStatus) proxy;
- AssertEquals( State.Invalid, inter.ActualState );
+ Assert.AreEqual( State.Invalid, inter.ActualState );
inter.ChangeState( State.Valid );
- AssertEquals( State.Valid, inter.ActualState );
+ Assert.AreEqual( State.Valid, inter.ActualState );
}
public class MyInterfaceProxy : IInvocationHandler
Modified:
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/SerializableClassTestCase.cs
==============================================================================
---
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/SerializableClassTestCase.cs
(original)
+++
avalon/trunk/central/laboratory/avalon-net/DynamicProxy/src/DynamicProxyTest/SerializableClassTestCase.cs
Tue Sep 28 19:41:10 2004
@@ -18,13 +18,13 @@
using NUnit.Framework;
- using Apache.Avalon.DynamicProxy.Test.Classes;
+ using Apache.Avalon.DynamicProxy.Test.Classes;
/// <summary>
/// Summary description for SerializableClassTestCase.
/// </summary>
[TestFixture]
- public class SerializableClassTestCase : Assertion
+ public class SerializableClassTestCase
{
[Test]
public void CreateSerializable()
@@ -35,7 +35,7 @@
MySerializableClass proxy = (MySerializableClass)
generator.CreateClassProxy(
typeof(MySerializableClass), new StandardInvocationHandler(myClass) );
- Assert( proxy.GetType().IsSerializable );
+ Assert.IsTrue( proxy.GetType().IsSerializable );
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
