nhibernate-commit

[Michael D. <mik...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/PropertyTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24450/PropertyTest

Modified Files:
	FieldAccessorFixture.cs FieldClass.cs 
Added Files:
	CamelCaseFixture.cs CamelCaseUnderscoreFixture.cs 
	PascalCaseMUnderscoreFixture.cs 
Removed Files:
	FieldMUnderscorePrefixAccessorFixture.cs 
	FieldUnderscorePrefixAccessorFixture.cs 
Log Message:
Refactored how naming strategies for fields are implemented.

--- FieldUnderscorePrefixAccessorFixture.cs DELETED ---

--- NEW FILE: CamelCaseFixture.cs ---
using System;

using NHibernate.Property;

using NUnit.Framework;

namespace NHibernate.Test.PropertyTest
{
	/// <summary>
	/// Summary description for CamelCaseFixture.
	/// </summary>
	[TestFixture]
	public class CamelCaseFixture : FieldAccessorFixture
	{
		[SetUp]
		public override void SetUp() 
		{
			_accessor = PropertyAccessorFactory.GetPropertyAccessor("field.camelcase");
			_getter = _accessor.GetGetter( typeof(FieldClass), "Id" );
			_setter = _accessor.GetSetter( typeof(FieldClass), "Id" );
			_instance = new FieldClass(2, -4, 3, 0 );
		}
	}
}


Index: FieldClass.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/PropertyTest/FieldClass.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FieldClass.cs	22 Aug 2004 06:19:46 -0000	1.1
--- FieldClass.cs	23 Aug 2004 02:10:31 -0000	1.2
***************
*** 8,26 ****
  	public class FieldClass 
  	{
  		private int _id;
! 		private int m_id;
  		private int id;
  
! 		public FieldClass( int underscoreId, int mUnderscoreId, int Id ) 
  		{
  			_id = underscoreId;
! 			m_id = mUnderscoreId;
! 			id = Id;
  		}
  
  		public void Increment() 
  		{
  			_id++;
! 			m_id++;
  			id++;
  		}
--- 8,29 ----
  	public class FieldClass 
  	{
+ 		private int Id;
  		private int _id;
! 		private int m_Id;
  		private int id;
  
! 		public FieldClass(int Id, int underscoreId, int mUnderscoreId, int camelId ) 
  		{
+ 			this.Id = Id;
  			_id = underscoreId;
! 			m_Id = mUnderscoreId;
! 			id = camelId;
  		}
  
  		public void Increment() 
  		{
+ 			Id++;
  			_id++;
! 			m_Id++;
  			id++;
  		}

--- NEW FILE: CamelCaseUnderscoreFixture.cs ---
using System;

using NHibernate.Property;

using NUnit.Framework;

namespace NHibernate.Test.PropertyTest
{
	/// <summary>
	/// Summary description for CamelCaseUnderscoreFixture.
	/// </summary>
	[TestFixture]
	public class CamelCaseUnderscoreFixture : FieldAccessorFixture
	{
		[SetUp]
		public override void SetUp() 
		{
			_accessor = PropertyAccessorFactory.GetPropertyAccessor("field.camelcase-underscore");
			_getter = _accessor.GetGetter( typeof(FieldClass), "Id" );
			_setter = _accessor.GetSetter( typeof(FieldClass), "Id" );
			_instance = new FieldClass(2, 0 , -4, 3 );
		}
	}
}

Index: FieldAccessorFixture.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.Test/PropertyTest/FieldAccessorFixture.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FieldAccessorFixture.cs	22 Aug 2004 06:19:46 -0000	1.1
--- FieldAccessorFixture.cs	23 Aug 2004 02:10:31 -0000	1.2
***************
*** 29,36 ****
  		public virtual void SetUp() 
  		{
! 			_accessor = new FieldAccessor();
  			_getter = _accessor.GetGetter( typeof(FieldClass), "Id" );
  			_setter = _accessor.GetSetter( typeof(FieldClass), "Id" );
! 			_instance = new FieldClass(6, -1, 0);
  		}
  
--- 29,36 ----
  		public virtual void SetUp() 
  		{
! 			_accessor = PropertyAccessorFactory.GetPropertyAccessor("field");
  			_getter = _accessor.GetGetter( typeof(FieldClass), "Id" );
  			_setter = _accessor.GetSetter( typeof(FieldClass), "Id" );
! 			_instance = new FieldClass( 0, 6, -1, 2);
  		}
  

--- FieldMUnderscorePrefixAccessorFixture.cs DELETED ---

--- NEW FILE: PascalCaseMUnderscoreFixture.cs ---
using System;

using NHibernate.Property;

using NUnit.Framework;

namespace NHibernate.Test.PropertyTest
{
	/// <summary>
	/// Summary description for PascalCaseMUnderscoreFixture.
	/// </summary>
	[TestFixture]
	public class PascalCaseMUnderscoreFixture : FieldAccessorFixture
	{
		[SetUp]
		public override void SetUp() 
		{
			_accessor = PropertyAccessorFactory.GetPropertyAccessor("field.pascalcase-m-underscore");
			_getter = _accessor.GetGetter( typeof(FieldClass), "Id" );
			_setter = _accessor.GetSetter( typeof(FieldClass), "Id" );
			_instance = new FieldClass( 6, -12 , 0, 13);
		}
	}
}