avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-sandbox/csframework/src/test AttributesTestCase.cs
Date Tue, 05 Aug 2003 13:36:57 GMT
bloritsch    2003/08/05 06:36:56

  Modified:    csframework/src/cs Attributes.cs
               csframework/src/test AttributesTestCase.cs
  Log:
  apply suggestion from Hammet to follow naming standards
  
  Revision  Changes    Path
  1.10      +6 -6      avalon-sandbox/csframework/src/cs/Attributes.cs
  
  Index: Attributes.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/csframework/src/cs/Attributes.cs,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Attributes.cs	1 Aug 2003 17:22:30 -0000	1.9
  +++ Attributes.cs	5 Aug 2003 13:36:49 -0000	1.10
  @@ -54,7 +54,7 @@
   	/// Attribute used to mark the services that a component implements
   	///</summary>	
   	[AttributeUsage(AttributeTargets.Class,AllowMultiple=true)]
  -	public sealed class AvalonService : Attribute
  +	public sealed class AvalonServiceAttribute : Attribute
   	{
   		private Type m_type;
   
  @@ -63,7 +63,7 @@
   		///</summary>
   		///<param name="type">The type for the service</param>
           ///<exception cref="ArgumentException">If the "type" value is not an interface</exception>
  -        public AvalonService(Type type)
  +        public AvalonServiceAttribute(Type type)
   		{
               if (!type.IsInterface)
               {
  @@ -107,7 +107,7 @@
   	///  Attribute to mark the dependencies for a component.
   	///</summary>
   	[AttributeUsage(AttributeTargets.Class,AllowMultiple=true)]
  -	public sealed class AvalonDependency : Attribute
  +	public sealed class AvalonDependencyAttribute : Attribute
   	{
   		private Type m_type;
   		private bool m_optional;
  @@ -120,7 +120,7 @@
           ///<param name="key">The dependency's lookup key</param>
   		///<param name="optional">Whether or not the dependency is optional</param>
   		///<exception cref="ArgumentException">If the "type" value is not an interface</exception>
  -		public AvalonDependency(Type type, string key, Optional optional)
  +		public AvalonDependencyAttribute(Type type, string key, Optional optional)
   		{
               if (!type.IsInterface)
               {
  @@ -197,7 +197,7 @@
   	///  Attribute used to mark a component as an Avalon component.
   	///</summary>
   	[AttributeUsage(AttributeTargets.Class,AllowMultiple=false)]
  -	public sealed class AvalonComponent : Attribute
  +	public sealed class AvalonComponentAttribute : Attribute
   	{
   		private Lifestyle m_lifestyle;
   		private string m_name;
  @@ -207,7 +207,7 @@
           /// </summary>
           /// <param name="name">The name used for configuration elements</param>
           /// <param name="lifestyle">The lifestyle used for the component</param>
  -		public AvalonComponent( string name, Lifestyle lifestyle )
  +		public AvalonComponentAttribute( string name, Lifestyle lifestyle )
   		{
   			m_lifestyle = lifestyle;
   			m_name = name;
  
  
  
  1.7       +4 -4      avalon-sandbox/csframework/src/test/AttributesTestCase.cs
  
  Index: AttributesTestCase.cs
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/csframework/src/test/AttributesTestCase.cs,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AttributesTestCase.cs	1 Aug 2003 17:22:30 -0000	1.6
  +++ AttributesTestCase.cs	5 Aug 2003 13:36:53 -0000	1.7
  @@ -59,7 +59,7 @@
   	public void Service()
   	{
   		Type type = typeof(IDisposable);
  -		AvalonService service = new AvalonService( type );
  +		AvalonServiceAttribute service = new AvalonServiceAttribute( type );
   		Assertion.AssertEquals( type, service.ServiceType );
   	}
   
  @@ -68,12 +68,12 @@
   	{
   		string name="test";
   		Type type = typeof(IDisposable);
  -		AvalonDependency dependency = new AvalonDependency(type,name,Optional.False);
  +		AvalonDependencyAttribute dependency = new AvalonDependencyAttribute(type,name,Optional.False);
   		Assertion.AssertEquals( type, dependency.DependencyType );
   		Assertion.AssertEquals( name, dependency.Key );
   		Assertion.AssertEquals( false, dependency.IsOptional );
   
  -		dependency = new AvalonDependency(type,null,Optional.True);
  +		dependency = new AvalonDependencyAttribute(type,null,Optional.True);
   		Assertion.AssertEquals( type, dependency.DependencyType );
   		Assertion.AssertEquals( type.Name, dependency.Key );
   		Assertion.AssertEquals( true, dependency.IsOptional );
  @@ -83,7 +83,7 @@
   	public void Component()
   	{
   		string name="test";
  -		AvalonComponent component = new AvalonComponent( name, Lifestyle.Singleton );
  +		AvalonComponentAttribute component = new AvalonComponentAttribute( name, Lifestyle.Singleton
);
   		Assertion.AssertNotNull( component );
   
   		Assertion.AssertEquals( name, component.ConfigurationName );
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message