NHV-132 Enum validation implementation & test (#8)

Author: AlexanderKot

src/NHibernate.Validator.Tests/Base/Address.cs

@@ -1,3 +1,4 @@
+using System;
 using NHibernate.Validator.Cfg.Loquacious;
 using NHibernate.Validator.Constraints;
 
@@ -20,6 +21,8 @@ public class Address
 		private string line2;
 		private string state;
 		private string zip;
+		private AddressType addressType = AddressType.Mailing;
+		private AddressFlag addressFlags = AddressFlag.Flag0; 
 
 		[Min(1), Range(Max = 2000), Max(2500)]
 		public long Id
@@ -69,8 +72,38 @@ public bool InternalValid
 			get { return internalValid; }
 			set { internalValid = value; }
 		}
+
+		[Enum]
+		public AddressType AddressType
+		{
+			get { return addressType; }
+			set { addressType = value; }
+		}
+
+		[Enum]
+		public AddressFlag AddressFlags
+		{
+			get { return addressFlags; }
+			set { addressFlags = value; }
+		}
 	}
 
+	public enum AddressType : byte
+	{
+		Home = 0,
+		Mailing = 1
+	}
+
+	[Flags] 
+	public enum AddressFlag : byte
+	{
+		Flag0 = 0,
+		Flag1 = 1,
+		Flag2 = 2,
+		Flag4 = 4
+	}
+
+
 	public class AddressDef: ValidationDef<Address>
 	{
 		public AddressDef()
@@ -93,6 +126,8 @@ public AddressDef()
 				.MatchWith("[0-9]+");
 			Define(x => x.InternalValid)
 				.IsTrue();
+			Define(x => x.AddressType).Enum();
+			Define(x => x.AddressFlags).Enum();
 		}
 	}
 }

src/NHibernate.Validator.Tests/Base/Address.nhv.xml

@@ -40,5 +40,13 @@
 		<property name="InternalValid">	
 				<asserttrue />
 		</property>
+		
+		<property name="AddressType">
+			<enum />
+		</property>
+
+		<property name="AddressFlags">
+			<enum />
+		</property>
 	</class>
 </nhv-mapping>

src/NHibernate.Validator.Tests/Integration/Address.hbm.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" 
-				   namespace="NHibernate.Validator.Tests.Base" 
-				   assembly="NHibernate.Validator.Tests"
-				   default-lazy="false">
+					 namespace="NHibernate.Validator.Tests.Base" 
+					 assembly="NHibernate.Validator.Tests"
+					 default-lazy="false">
 
 	<class name="Address">
 
@@ -16,5 +16,7 @@
 		<property name="Line1" />
 		<property name="Line2" />
 		<property name ="floor" access="field"/>
+		<property name="AddressType" />
+		<property name="AddressFlags" />
 	</class>
 </hibernate-mapping>

src/NHibernate.Validator.Tests/Integration/HibernateAnnotationIntegrationFixture.cs

@@ -78,7 +78,7 @@ public void CleanupData()
 		public virtual void EnsureSharedEngine()
 		{
 			Assert.IsTrue(ReferenceEquals(fortest, Cfg.Environment.SharedEngineProvider),
-			              "some process change the shared engine instance");
+						  "some process change the shared engine instance");
 			// Have something initialized before and after lister initialization
 			Assert.IsNotNull(fortest.GetEngine().GetValidator<AnyClass>());
 			Assert.IsNotNull(fortest.GetEngine().GetValidator<Address>());
@@ -136,6 +136,22 @@ public void SingleTableAvoidNotNull()
 			Assert.IsTrue(serialColumn.IsNullable, "Notnull should not be applied on single tables");
 		}
 
+		[Test]
+		public void ApplyOnEnumColumn()
+		{
+			PersistentClass classMapping = cfg.GetClassMapping(typeof(Address));
+			IEnumerator ie = classMapping.GetProperty("AddressType").ColumnIterator.GetEnumerator();
+			ie.MoveNext();
+			Column serialColumn = (Column)ie.Current;
+			Assert.AreEqual("AddressType in (0, 1)", serialColumn.CheckConstraint , "Validator annotation shout generate valid check for Enums");
+
+			ie = classMapping.GetProperty("AddressFlags").ColumnIterator.GetEnumerator();
+			ie.MoveNext();
+			serialColumn = (Column)ie.Current;
+
+			Assert.That(serialColumn.CheckConstraint, Is.Null.Or.Empty, "Validator annotation should not generate check for [Flag]ed Enums");
+		}
+
 		/// <summary>
 		/// Test pre-update/save events and custom interpolator
 		/// </summary>
@@ -151,6 +167,8 @@ public void Events()
 			a.Line1 = "Line 1";
 			a.Zip = "nonnumeric";
 			a.State = "NY";
+			a.AddressType = (AddressType) 42;
+			a.AddressFlags = AddressFlag.Flag1 | AddressFlag.Flag2 | (AddressFlag)66;
 			s = OpenSession();
 			tx = s.BeginTransaction();
 			s.Save(a);
@@ -163,7 +181,7 @@ public void Events()
 			{
 				//success
 				var invalidValues = e.GetInvalidValues();
-				Assert.That(invalidValues, Has.Length.EqualTo(2));
+				Assert.That(invalidValues, Has.Length.EqualTo(4));
 				Assert.That(invalidValues, Has.All.Message.StartsWith("prefix_"), "Environment.MESSAGE_INTERPOLATOR_CLASS does not work");
 			}
 			finally
@@ -182,6 +200,8 @@ public void Events()
 			a.State = "NY";
 			s.Save(a);
 			a.State = "TOOLONG";
+			a.AddressType = AddressType.Mailing;
+			a.AddressFlags = AddressFlag.Flag1 | AddressFlag.Flag2 | AddressFlag.Flag4; 
 			try 
 			{
 				s.Flush();

src/NHibernate.Validator.Tests/Mappings/ReflectionClassMappingFixture.cs

@@ -51,7 +51,7 @@ public void Members()
 		{
 			ReflectionClassMapping rm = new ReflectionClassMapping(typeof (Address));
 			List<MemberInfo> mi = new List<MemberInfo>(rm.GetMembers());
-			Assert.AreEqual(16, mi.Count);
+			Assert.AreEqual(20, mi.Count);
 
 			rm = new ReflectionClassMapping(typeof(Polimorphism.DerivatedClass));
 			mi = new List<MemberInfo>(rm.GetMembers());

src/NHibernate.Validator.Tests/Mappings/XmlClassMappingFixture.cs

@@ -62,7 +62,7 @@ public void Members()
 		{
 			XmlClassMapping rm = new XmlClassMapping(GetNhvClassFor(typeof(Address)));
 			List<MemberInfo> mi = new List<MemberInfo>(rm.GetMembers());
-			Assert.AreEqual(8, mi.Count);
+			Assert.AreEqual(10, mi.Count);
 		}
 
 		[Test]

src/NHibernate.Validator/Cfg/Loquacious/IEnumConstraints.cs

@@ -0,0 +1,9 @@
+namespace NHibernate.Validator.Cfg.Loquacious
+{
+	public interface IEnumConstraints
+	{
+		IChainableConstraint<IEnumConstraints> NotNullable();
+
+		IChainableConstraint<IEnumConstraints> Enum();
+	}
+}

src/NHibernate.Validator/Cfg/Loquacious/Impl/EnumConstraints.cs

@@ -0,0 +1,24 @@
+using System.Reflection;
+using NHibernate.Validator.Constraints;
+
+namespace NHibernate.Validator.Cfg.Loquacious.Impl
+{
+	class EnumConstraints : BaseConstraints<IEnumConstraints>, IEnumConstraints 
+	{
+		public EnumConstraints(IConstraintAggregator parent, MemberInfo member) : base(parent, member) {}
+
+		#region Implementation of IEnumConstraints
+
+		public IChainableConstraint<IEnumConstraints> NotNullable()
+		{
+			return AddWithConstraintsChain(new NotNullAttribute());
+		}
+
+		public IChainableConstraint<IEnumConstraints> Enum()
+		{
+			return AddWithConstraintsChain(new EnumAttribute());
+		}
+
+		#endregion
+	}
+}

src/NHibernate.Validator/Cfg/Loquacious/ValidationDef.cs

@@ -171,6 +171,11 @@ public IRelationshipConstraints Define(Expression<Func<T, object>> property)
 			return new RelationshipConstraints(this, DecodeMemberAccessExpression(property));
 		}
 
+		public IEnumConstraints Define(Expression<Func<T, Enum>> property)
+		{
+			return new EnumConstraints(this, DecodeMemberAccessExpression(property));
+		}
+		
 		public void Add(MemberInfo member, Attribute ruleArgs)
 		{
 			classMap.AddMemberConstraint(member, ruleArgs);

src/NHibernate.Validator/Cfg/MappingSchema/RuleAttributeFactory.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Reflection;
 using System.Text.RegularExpressions;
+using System.Collections.Generic;
 
 using NHibernate.Util;
-using System.Collections.Generic;
 using NHibernate.Validator.Constraints;
 using NHibernate.Validator.Engine;
 using NHibernate.Validator.Exceptions;
@@ -43,6 +43,7 @@ static RuleAttributeFactory()
 			wellKnownRules[typeof(NhvmFileexists)] = ConvertToFileExists;
 			wellKnownRules[typeof(NhvmValid)] = ConvertToValid;
 			wellKnownRules[typeof(NhvmIban)] = ConvertToIBAN;
+			wellKnownRules[typeof(NhvmEnum)] = ConvertToEnum;
 		}
 
 		private static Attribute ConvertToDecimalMin(XmlNhvmRuleConverterArgs rule)
@@ -437,7 +438,6 @@ private static Attribute ConvertToFuture(XmlNhvmRuleConverterArgs rule)
 			return thisAttribute;
 		}
 
-
 		private static Attribute ConvertToSize(XmlNhvmRuleConverterArgs rule)
 		{
 			NhvmSize sizeRule = (NhvmSize)rule.schemaRule;
@@ -561,7 +561,6 @@ private static Attribute ConvertToNotNull(XmlNhvmRuleConverterArgs rule)
 			return thisAttribute;
 		}
 
-
 		private static Attribute ConvertToFileExists(XmlNhvmRuleConverterArgs rule)
 		{
 			NhvmFileexists fileExistsRule = (NhvmFileexists)rule.schemaRule;
@@ -591,6 +590,21 @@ private static Attribute ConvertToIBAN(XmlNhvmRuleConverterArgs rule)
 			return thisAttribute;
 		}
 
+		private static Attribute ConvertToEnum(XmlNhvmRuleConverterArgs rule)
+		{
+			NhvmEnum notNullRule = (NhvmEnum)rule.schemaRule;
+			EnumAttribute thisAttribute = new EnumAttribute();
+			log.Info("Converting to EnumAttribute");
+
+			if (notNullRule.message != null)
+			{
+				thisAttribute.Message = notNullRule.message;
+			}
+			AssignTagsFromString(thisAttribute, notNullRule.tags);
+
+			return thisAttribute;
+		}
+
 		private delegate Attribute ConvertSchemaRule(XmlNhvmRuleConverterArgs schemaRule);
 		private class XmlNhvmRuleConverterArgs
 		{