Throw for Criteria over not mapped entity (#2487)

Fixes #1095

src/NHibernate.Test/Async/Criteria/CriteriaQueryTest.cs

@@ -2441,6 +2441,22 @@ public async Task SubcriteriaJoinTypesAsync()
 			session.Close();
 		}
 
+		public class NotMappedEntity
+		{
+			public  virtual  int Id { get; set; }
+			public  virtual  string Name { get; set; }
+		}
+
+		[Test]
+		public void CriteriaOnNotMappedEntityAsync()
+		{
+			using (ISession session = OpenSession())
+			{
+				Assert.ThrowsAsync<QueryException>(
+					() => session.CreateCriteria(typeof(NotMappedEntity)).ListAsync());
+			}
+		}
+
 		[Test]
 		public void TypeMismatchAsync()
 		{

src/NHibernate.Test/Async/Events/Collections/AbstractCollectionEventFixture.cs

@@ -8,6 +8,7 @@
 //------------------------------------------------------------------------------
 
 
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using NHibernate.Collection;
@@ -38,30 +39,12 @@ protected override string MappingsAssembly
 
 		protected override void OnTearDown()
 		{
-			IParentWithCollection dummyParent = CreateParent("dummyParent");
-			dummyParent.NewChildren(CreateCollection());
-			IChild dummyChild = dummyParent.AddChild("dummyChild");
-
-			using (ISession s = OpenSession())
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
 			{
-				using (ITransaction tx = s.BeginTransaction())
-				{
-					IList children = s.CreateCriteria(dummyChild.GetType()).List();
-					IList parents = s.CreateCriteria(dummyParent.GetType()).List();
-					foreach (IParentWithCollection parent in parents)
-					{
-						parent.ClearChildren();
-						s.Delete(parent);
-					}
-					foreach (IChild child in children)
-					{
-						s.Delete(child);
-					}
-
-					tx.Commit();
-				}
+				s.Delete("from System.Object");
+				tx.Commit();
 			}
-			base.OnTearDown();
 		}
 
 		[Test]

src/NHibernate.Test/Async/NHSpecificTest/NH1159/Fixture.cs

@@ -59,9 +59,9 @@ public async Task DoesNotFlushWithCriteriaWithCommitAsync()
 
 				Assert.That(HibernateInterceptor.CallCount, Is.EqualTo(1));
 
-				ICriteria query = session.CreateCriteria(typeof(ContactTitle));
+				ICriteria query = session.CreateCriteria(typeof(Contact));
 				query.Add(Expression.Eq("Id", (Int64)1));
-				await (query.UniqueResultAsync<ContactTitle>());
+				await (query.UniqueResultAsync<Contact>());
 
 				Assert.That(HibernateInterceptor.CallCount, Is.EqualTo(1));
 
@@ -89,9 +89,9 @@ public async Task DoesNotFlushWithCriteriaWithNeverAsync()
 
 				Assert.That(HibernateInterceptor.CallCount, Is.EqualTo(1));
 
-				ICriteria query = session.CreateCriteria(typeof(ContactTitle));
+				ICriteria query = session.CreateCriteria(typeof(Contact));
 				query.Add(Expression.Eq("Id", (Int64)1));
-				await (query.UniqueResultAsync<ContactTitle>());
+				await (query.UniqueResultAsync<Contact>());
 
 				Assert.That(HibernateInterceptor.CallCount, Is.EqualTo(1));
 
@@ -120,9 +120,9 @@ public async Task DoesNotFlushWithCriteriaWithAutoAsync()
 
 				Assert.That(HibernateInterceptor.CallCount, Is.EqualTo(1));
 
-				ICriteria query = session.CreateCriteria(typeof(ContactTitle));
+				ICriteria query = session.CreateCriteria(typeof(Contact));
 				query.Add(Expression.Eq("Id", (Int64)1));
-				await (query.UniqueResultAsync<ContactTitle>());
+				await (query.UniqueResultAsync<Contact>());
 
 				Assert.That(HibernateInterceptor.CallCount, Is.EqualTo(2));
 

src/NHibernate.Test/Async/NHSpecificTest/NH1688/Fixture.cs

@@ -68,7 +68,7 @@ protected override void OnTearDown()
 		{
 			using (ISession session = OpenSession())
 			{
-				DetachedCriteria criteria = DetachedCriteria.For<NH1679.DomainClass>("alias");
+				DetachedCriteria criteria = DetachedCriteria.For<DomainClass>("alias");
 
 				action.Invoke(criteria);
 
@@ -77,4 +77,4 @@ protected override void OnTearDown()
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/Async/TransactionTest/TransactionNotificationFixture.cs

@@ -11,6 +11,8 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using NHibernate.Cfg;
+using NHibernate.Mapping.ByCode;
 using NHibernate.Transaction;
 using NUnit.Framework;
 
@@ -21,7 +23,27 @@ namespace NHibernate.Test.TransactionTest
 	[TestFixture]
 	public class TransactionNotificationFixtureAsync : TestCase
 	{
-		protected override string[] Mappings => Array.Empty<string>();
+		public class Entity
+		{
+			public virtual int Id { get; set; }
+			public virtual string Name { get; set; }
+		}
+
+		protected override string[] Mappings => null;
+
+		protected override void AddMappings(Configuration configuration)
+		{
+			var modelMapper = new ModelMapper();
+			modelMapper.Class<Entity>(
+				x =>
+				{
+					x.Id(e => e.Id);
+					x.Property(e => e.Name);
+					x.Table(nameof(Entity));
+				});
+
+			configuration.AddMapping(modelMapper.CompileMappingForAllExplicitlyAddedEntities());
+		}
 
 		[Test]
 		public async Task CommitAsync()

src/NHibernate.Test/Criteria/CriteriaQueryTest.cs

@@ -2538,6 +2538,22 @@ public void SubcriteriaJoinTypes()
 			session.Close();
 		}
 
+		public class NotMappedEntity
+		{
+			public  virtual  int Id { get; set; }
+			public  virtual  string Name { get; set; }
+		}
+
+		[Test]
+		public void CriteriaOnNotMappedEntity()
+		{
+			using (ISession session = OpenSession())
+			{
+				Assert.Throws<QueryException>(
+					() => session.CreateCriteria(typeof(NotMappedEntity)).List());
+			}
+		}
+
 		[Test]
 		public void TypeMismatch()
 		{

src/NHibernate.Test/Events/Collections/AbstractCollectionEventFixture.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using NHibernate.Collection;
@@ -26,30 +27,12 @@ protected override string MappingsAssembly
 
 		protected override void OnTearDown()
 		{
-			IParentWithCollection dummyParent = CreateParent("dummyParent");
-			dummyParent.NewChildren(CreateCollection());
-			IChild dummyChild = dummyParent.AddChild("dummyChild");
-
-			using (ISession s = OpenSession())
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
 			{
-				using (ITransaction tx = s.BeginTransaction())
-				{
-					IList children = s.CreateCriteria(dummyChild.GetType()).List();
-					IList parents = s.CreateCriteria(dummyParent.GetType()).List();
-					foreach (IParentWithCollection parent in parents)
-					{
-						parent.ClearChildren();
-						s.Delete(parent);
-					}
-					foreach (IChild child in children)
-					{
-						s.Delete(child);
-					}
-
-					tx.Commit();
-				}
+				s.Delete("from System.Object");
+				tx.Commit();
 			}
-			base.OnTearDown();
 		}
 
 		[Test]

src/NHibernate.Test/NHSpecificTest/NH1159/Fixture.cs

@@ -48,9 +48,9 @@ public void DoesNotFlushWithCriteriaWithCommit()
 
 				Assert.That(HibernateInterceptor.CallCount, Is.EqualTo(1));
 
-				ICriteria query = session.CreateCriteria(typeof(ContactTitle));
+				ICriteria query = session.CreateCriteria(typeof(Contact));
 				query.Add(Expression.Eq("Id", (Int64)1));
-				query.UniqueResult<ContactTitle>();
+				query.UniqueResult<Contact>();
 
 				Assert.That(HibernateInterceptor.CallCount, Is.EqualTo(1));
 
@@ -78,9 +78,9 @@ public void DoesNotFlushWithCriteriaWithNever()
 
 				Assert.That(HibernateInterceptor.CallCount, Is.EqualTo(1));
 
-				ICriteria query = session.CreateCriteria(typeof(ContactTitle));
+				ICriteria query = session.CreateCriteria(typeof(Contact));
 				query.Add(Expression.Eq("Id", (Int64)1));
-				query.UniqueResult<ContactTitle>();
+				query.UniqueResult<Contact>();
 
 				Assert.That(HibernateInterceptor.CallCount, Is.EqualTo(1));
 
@@ -109,9 +109,9 @@ public void DoesNotFlushWithCriteriaWithAuto()
 
 				Assert.That(HibernateInterceptor.CallCount, Is.EqualTo(1));
 
-				ICriteria query = session.CreateCriteria(typeof(ContactTitle));
+				ICriteria query = session.CreateCriteria(typeof(Contact));
 				query.Add(Expression.Eq("Id", (Int64)1));
-				query.UniqueResult<ContactTitle>();
+				query.UniqueResult<Contact>();
 
 				Assert.That(HibernateInterceptor.CallCount, Is.EqualTo(2));