NHV-117 - Using Validator and Envers together, fix & test

Author: alexander.kot@gmail.com

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

@@ -0,0 +1,137 @@
+using System.Collections;
+
+using NHibernate.Cfg;
+using NHibernate.Envers.Configuration.Fluent;
+using NHibernate.Validator.Cfg;
+using NHibernate.Validator.Engine;
+using NHibernate.Validator.Event;
+using NHibernate.Validator.Exceptions;
+using NHibernate.Validator.Tests.Base;
+
+using NUnit.Framework;
+using SharpTestsEx;
+
+namespace NHibernate.Validator.Tests.Integration
+{
+	class EnversIntegrationFixture : PersistenceTest
+	{
+		protected override IList Mappings
+		{
+			get
+			{
+				return new string[]
+				{
+					"Integration.Address.hbm.xml",
+				};
+			}
+		}
+
+		protected ISharedEngineProvider fortest;
+		protected override void Configure(NHibernate.Cfg.Configuration configuration)
+		{
+			// The ValidatorInitializer and the ValidateEventListener share the same engine
+
+			// Initialize the SharedEngine
+			fortest = new NHibernateSharedEngineProvider();
+			Cfg.Environment.SharedEngineProvider = fortest;
+			ValidatorEngine ve = Cfg.Environment.SharedEngineProvider.GetEngine();
+			ve.Clear();
+
+			XmlConfiguration nhvc = new XmlConfiguration();
+			nhvc.Properties[Cfg.Environment.ApplyToDDL] = "true";
+			nhvc.Properties[Cfg.Environment.AutoregisterListeners] = "true";
+			nhvc.Properties[Cfg.Environment.ValidatorMode] = "UseAttribute";
+			nhvc.Properties[Cfg.Environment.MessageInterpolatorClass] = typeof(PrefixMessageInterpolator).AssemblyQualifiedName;
+
+			var enversConf = new FluentConfiguration();
+			enversConf.Audit<Address>();
+			configuration.IntegrateWithEnvers(enversConf);
+
+			ve.Configure(nhvc);
+
+			ValidatorInitializer.Initialize(configuration);
+		}
+
+
+		[Test]
+		public void ShouldWorkSUIDWithEnversAndValidators()
+		{
+			ISession s;
+			Address.blacklistedZipCode = "3232";
+
+			// Don't throw exception if it is valid
+			Address a = new Address();
+
+			a.Id = 13;
+			a.Country = "Country";
+			a.Line1 = "Line 1";
+			a.Zip = "4343";
+			a.State = "NY";
+			try
+			{
+				using (s = OpenSession())
+				using (ITransaction t = s.BeginTransaction())
+				{
+					s.Save(a);
+					t.Commit();
+				}
+			}
+			catch (InvalidStateException)
+			{
+				Assert.Fail("Valid entity cause InvalidStateException");
+			}
+
+			// Update check
+			try
+			{
+				using (s = OpenSession())
+				using (ITransaction t = s.BeginTransaction())
+				{
+					Address saved = s.Get<Address>(13L);
+					saved.State = "TOOLONG";
+					s.Update(saved);
+					t.Commit();
+					Assert.Fail("entity should have been validated");
+				}
+			}
+			catch (InvalidStateException e)
+			{
+				e.GetInvalidValues().Should().Not.Be.Empty();
+			}
+
+			try
+			{
+				using (s = OpenSession())
+				using (ITransaction t = s.BeginTransaction())
+				{
+					Address saved = s.Get<Address>(13L);
+					a.Zip = "1234";
+					saved.State = "BO";
+					s.Update(saved);
+					t.Commit();
+				}
+			}
+			catch (InvalidStateException)
+			{
+				Assert.Fail("Valid entity cause InvalidStateException");
+			}
+
+
+			// clean up
+			using (s = OpenSession())
+			{
+				using (ITransaction t = s.BeginTransaction())
+				{
+					Address saved = s.Get<Address>(13L);
+					s.Delete(saved);
+					t.Commit();
+				}
+
+				var c = s.Connection.CreateCommand();
+				c.CommandText = "DELETE FROM Address_AUD; DELETE FROM REVINFO;";
+				c.ExecuteScalar();
+
+			}
+		}
+	}
+}

src/NHibernate.Validator.Tests/NHibernate.Validator.Tests.csproj

@@ -72,6 +72,10 @@
       <HintPath>..\packages\NHibernate.5.0.0\lib\net461\NHibernate.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="NHibernate.Envers, Version=5.0.1.0, Culture=neutral, PublicKeyToken=e2c5b946037fb7f8, processorArchitecture=MSIL">
+      <HintPath>..\packages\NHibernate.Envers.5.0.1\lib\net461\NHibernate.Envers.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
@@ -178,6 +182,7 @@
     <Compile Include="GraphNavigation\User.cs" />
     <Compile Include="GraphNavigation\Address.cs" />
     <Compile Include="Inheritance\LoquaciousInheritanceFixture.cs" />
+    <Compile Include="Integration\EnversIntegrationFixture.cs" />
     <Compile Include="Integration\IntegrationOwnEngineFixture.cs" />
     <Compile Include="Integration\SimpleWithRelation.cs" />
     <Compile Include="Integration\ValidateEventsFixture.cs" />

src/NHibernate.Validator.Tests/packages.config

@@ -4,6 +4,7 @@
   <package id="Iesi.Collections" version="4.0.2" targetFramework="net461" />
   <package id="log4net" version="2.0.8" targetFramework="net40" />
   <package id="NHibernate" version="5.0.0" targetFramework="net461" />
+  <package id="NHibernate.Envers" version="5.0.1" targetFramework="net461" />
   <package id="NUnit" version="3.8.1" targetFramework="net45" />
   <package id="Remotion.Linq" version="2.1.2" targetFramework="net461" />
   <package id="Remotion.Linq.EagerFetching" version="2.1.0" targetFramework="net461" />

src/NHibernate.Validator/Cfg/ValidatorInitializer.cs

@@ -88,6 +88,8 @@ private static void ApplyValidatorToDDL(PersistentClass persistentClass, Validat
 		{
 			try
 			{
+				if (!persistentClass.HasPocoRepresentation)
+					return;
 				IClassValidator classValidator = ve.GetClassValidator(persistentClass.MappedClass);
 				classValidator.Apply(persistentClass);
 			}

src/NHibernate.Validator/Event/ValidatePreInsertEventListener.cs

@@ -46,7 +46,7 @@ public void Initialize(Configuration cfg)
 				Engine = Environment.SharedEngineProvider.GetEngine();
 			}
 
-			IEnumerable<PersistentClass> classes = cfg.ClassMappings.Where(clazz => clazz.ClassName != null).Where(clazz => !clazz.ClassName.StartsWith("NHibernate.Envers"));
+			var classes = cfg.ClassMappings.Where(clazz => clazz.HasPocoRepresentation);
 
 			foreach (PersistentClass clazz in classes)
 			{