some random changes

Author: bahusoid

src/NHibernate.DomainModel/Container.cs

@@ -92,7 +92,7 @@ public Glarch Glarch
 		private IDictionary<string, Ternary> _ternaryMap;
 		//<set> mapping
 		private ISet<Ternary> _ternarySet;
-		private One _one;
+		private One _oneToOne;
 
 		public virtual IList<Simple> OneToMany
 		{
@@ -130,10 +130,10 @@ public virtual long Id
 			set { _id = value; }
 		}
 
-		public virtual One One
+		public virtual One OneToOne
 		{
-			get => _one;
-			set => _one = value;
+			get => _oneToOne;
+			set => _oneToOne = value;
 		}
 
 		public virtual IList<Contained> Bag

src/NHibernate.DomainModel/Container.hbm.xml

@@ -22,7 +22,7 @@
 		>
 			<generator class="native" />
 		</id>
-		<one-to-one name="One" />
+		<one-to-one name="OneToOne" />
 		<list 
 			name="OneToMany" 
 			lazy="true"

src/NHibernate.Test/Async/Legacy/ParentChildTest.cs

@@ -383,9 +383,10 @@ public async Task CollectionQueryAsync()
 			l.Add(null);
 			l.Add(s2);
 			c.ManyToMany = l;
-			c.One = new One { Value = "one" };
-			await (s.SaveAsync(c.One));
+			c.OneToOne = new One { Value = "one" };
+			await (s.SaveAsync(c.OneToOne));
 			await (s.SaveAsync(c));
+			await (s.FlushAsync());
 
 			Assert.AreEqual(1,
 			                (await (s.CreateQuery("select c from c in class ContainerX, s in class Simple where c.OneToMany[2] = s").ListAsync
@@ -429,7 +430,7 @@ public async Task CollectionQueryAsync()
 			                	"select c from c in class ContainerX where c.ManyToMany[ c.OneToMany[0].Count ].Name = 's'").ListAsync())).
 			                	Count);
 
-			await (s.DeleteAsync(c.One));
+			await (s.DeleteAsync(c.OneToOne));
 			await (s.DeleteAsync(c));
 			await (s.DeleteAsync(s1));
 			await (s.DeleteAsync(s2));

src/NHibernate.Test/Legacy/ParentChildTest.cs

@@ -372,15 +372,16 @@ public void CollectionQuery()
 			l.Add(null);
 			l.Add(s2);
 			c.ManyToMany = l;
-			c.One = new One { Value = "one" };
-			s.Save(c.One);
+			c.OneToOne = new One { Value = "one" };
+			s.Save(c.OneToOne);
 			s.Save(c);
+			s.Flush();
 
 			Assert.AreEqual(1,
 			                s.CreateQuery("select c from c in class ContainerX, s in class Simple where c.OneToMany[2] = s").List
 			                	().Count);			
 			Assert.AreEqual(1,
-			                s.CreateQuery("select c from c in class ContainerX, s in class Simple where c.OneToMany[2] = s and c.One != null").List
+			                s.CreateQuery("select c from c in class ContainerX, s in class Simple where c.OneToMany[2] = s and c.OneToOne != null").List
 			                	().Count);
 			Assert.AreEqual(1,
 			                s.CreateQuery("select c from c in class ContainerX, s in class Simple where c.ManyToMany[2] = s").
@@ -418,7 +419,7 @@ public void CollectionQuery()
 			                	"select c from c in class ContainerX where c.ManyToMany[ c.OneToMany[0].Count ].Name = 's'").List().
 			                	Count);
 
-			s.Delete(c.One);
+			s.Delete(c.OneToOne);
 			s.Delete(c);
 			s.Delete(s1);
 			s.Delete(s2);