Use simpler mapping for interface proxy test

Author: bahusoid

src/NHibernate.Test/Async/StaticProxyTest/InterfaceHandling/Fixture.cs

@@ -45,7 +45,7 @@ protected override HbmMapping GetMappings()
 			mapper.UnionSubclass<AnotherSubEntityInterfaceProxy>(
 				rc =>
 				{
-					rc.Proxy(typeof(IAmbigiousSubEntityProxy));
+					rc.Proxy(typeof(IAnotherEntityProxy));
 
 					rc.Property(x => x.AnotherName);
 				});
@@ -85,6 +85,15 @@ protected override HbmMapping GetMappings()
 			mapper.Class<EntityMixExplicitImplicitInterface>(
 				rc =>
 				{
+					rc.Table("multiInterface");
+					rc.Id(x => x.Id);
+					rc.Property(x => x.Name);
+				});
+
+			mapper.Class<EntityMultiIdProxy>(
+				rc =>
+				{
+					rc.Proxy(typeof(IMultiIdProxy));
 					rc.Id(x => x.Id);
 					rc.Property(x => x.Name);
 				});
@@ -145,7 +154,7 @@ public async Task ProxyClassIdAccessBothImplicitExplicitInterfacesAsync()
 		}
 
 		[Test]
-		public async Task ProxyInterfaceAsync()
+		public async Task ProxyInterfaceIdAccessAsync()
 		{
 			using (var session = OpenSession())
 			{
@@ -157,11 +166,11 @@ public async Task ProxyInterfaceAsync()
 
 		[KnownBug("GH-2271")]
 		[Test]
-		public async Task ProxyInterfaceCanAccessIdFromDifferentInterfacesAsync()
+		public async Task ProxyInterfaceIdAccessFromDifferentInterfacesAsync()
 		{
 			using (var session = OpenSession())
 			{
-				var entity = await (session.LoadAsync<IAmbigiousSubEntityProxy>(_id));
+				var entity = await (session.LoadAsync<IMultiIdProxy>(_id));
 
 				CanAccessIEntityId(entity);
 				CanAccessIEntity2Id(entity);

src/NHibernate.Test/StaticProxyTest/InterfaceHandling/Entities.cs

@@ -38,6 +38,17 @@ string IEntity.Name
 		}
 	}
 
+	//Proxy contains IEntity.Id and IEntity2.Id
+	public interface IMultiIdProxy : IEntity, IEntity2
+	{
+	}
+
+	public class EntityMultiIdProxy : IMultiIdProxy
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+
 	public class EntityMixExplicitImplicitInterface : IEntity, IEntity2
 	{
 		private Guid id;

src/NHibernate.Test/StaticProxyTest/InterfaceHandling/Fixture.cs

@@ -34,7 +34,7 @@ protected override HbmMapping GetMappings()
 			mapper.UnionSubclass<AnotherSubEntityInterfaceProxy>(
 				rc =>
 				{
-					rc.Proxy(typeof(IAmbigiousSubEntityProxy));
+					rc.Proxy(typeof(IAnotherEntityProxy));
 
 					rc.Property(x => x.AnotherName);
 				});
@@ -74,6 +74,15 @@ protected override HbmMapping GetMappings()
 			mapper.Class<EntityMixExplicitImplicitInterface>(
 				rc =>
 				{
+					rc.Table("multiInterface");
+					rc.Id(x => x.Id);
+					rc.Property(x => x.Name);
+				});
+
+			mapper.Class<EntityMultiIdProxy>(
+				rc =>
+				{
+					rc.Proxy(typeof(IMultiIdProxy));
 					rc.Id(x => x.Id);
 					rc.Property(x => x.Name);
 				});
@@ -134,7 +143,7 @@ public void ProxyClassIdAccessBothImplicitExplicitInterfaces()
 		}
 
 		[Test]
-		public void ProxyInterface()
+		public void ProxyInterfaceIdAccess()
 		{
 			using (var session = OpenSession())
 			{
@@ -146,11 +155,11 @@ public void ProxyInterface()
 
 		[KnownBug("GH-2271")]
 		[Test]
-		public void ProxyInterfaceCanAccessIdFromDifferentInterfaces()
+		public void ProxyInterfaceIdAccessFromDifferentInterfaces()
 		{
 			using (var session = OpenSession())
 			{
-				var entity = session.Load<IAmbigiousSubEntityProxy>(_id);
+				var entity = session.Load<IMultiIdProxy>(_id);
 
 				CanAccessIEntityId(entity);
 				CanAccessIEntity2Id(entity);

src/NHibernate.Test/StaticProxyTest/InterfaceHandling/SubclassEntities.cs

@@ -19,12 +19,12 @@ class SubEntityInterfaceProxy : EntityClassProxy, ISubEntityProxy
 		public virtual string AnotherName { get; set; }
 	}
 
-	public interface IAmbigiousSubEntityProxy : IEntity, IEntity2
+	public interface IAnotherEntityProxy : IEntity
 	{
 		string AnotherName { get; set; }
 	}
 
-	class AnotherSubEntityInterfaceProxy : EntityClassProxy, IAmbigiousSubEntityProxy
+	class AnotherSubEntityInterfaceProxy : EntityClassProxy, IAnotherEntityProxy
 	{
 		public virtual string AnotherName { get; set; }
 	}