Adjust tests that use LogSpy to look at RenderedMessage.

ngbrown · ngbrown · commit dc2dc22a2e2c · 2017-11-03T07:24:52.000-07:00
diff --git a/src/NHibernate.Test/Async/NHSpecificTest/CriteriaFromHql/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/CriteriaFromHql/Fixture.cs
@@ -48,7 +48,7 @@ join fetch c.Children gc
 where p.Parent is null")
 					.UniqueResultAsync<Person>());
 
-				string hqlQuery = spy.Appender.GetEvents()[0].MessageObject.ToString();
+				string hqlQuery = spy.Appender.GetEvents()[0].RenderedMessage;
 				Debug.WriteLine("HQL: " + hqlQuery);
 				Assertions(result);
 			}
@@ -62,7 +62,7 @@ join fetch c.Children gc
 					.SetFetchMode("Children", FetchMode.Join)
 					.SetFetchMode("Children.Children", FetchMode.Join)
 					.UniqueResultAsync<Person>());
-				string criteriaQuery = spy.Appender.GetEvents()[0].MessageObject.ToString();
+				string criteriaQuery = spy.Appender.GetEvents()[0].RenderedMessage;
 				Debug.WriteLine("Criteria: " + criteriaQuery);
 				Assertions(result);
 			}
diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1144/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1144/Fixture.cs
@@ -64,7 +64,7 @@ public async Task CanSaveInSingleBatchAsync()
 						await (tx.CommitAsync());
 						foreach (LoggingEvent loggingEvent in spy.Appender.GetEvents())
 						{
-							if ("Executing batch".Equals(loggingEvent.MessageObject))
+							if ("Executing batch".Equals(loggingEvent.RenderedMessage))
 							{
 								executedBatch = true;
 								break;
diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH1347/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH1347/Fixture.cs
@@ -49,7 +49,7 @@ public async Task BugAsync()
 					.UniqueResultAsync<A>());
 				Assert.AreEqual("1", a.Name);
 				Assert.IsTrue(
-					spy.Appender.GetEvents()[0].MessageObject.ToString().Contains("limit")
+					spy.Appender.GetEvents()[0].RenderedMessage.Contains("limit")
 					);
 			}
 
diff --git a/src/NHibernate.Test/Async/SqlTest/Identity/IdentityInsertWithStoredProcsTest.cs b/src/NHibernate.Test/Async/SqlTest/Identity/IdentityInsertWithStoredProcsTest.cs
@@ -51,7 +51,7 @@ public async Task InsertUsesStoredProcAsync()
 
 				Assert.AreEqual(1, spy.Appender.GetEvents().Length, "Num loggedEvents");
 				Assert.AreEqual(1, ifa.Id, "ifa.Id");
-				Assert.AreEqual(GetExpectedInsertOrgLogStatement("IFA"), spy.Appender.GetEvents()[0].MessageObject, "Message 1");
+				Assert.AreEqual(GetExpectedInsertOrgLogStatement("IFA"), spy.Appender.GetEvents()[0].RenderedMessage, "Message 1");
 				using (ISession s = OpenSession())
 				using (ITransaction t = s.BeginTransaction())
 				{
@@ -73,7 +73,7 @@ public async Task InsertUsesStoredProcAsync()
 
 				Assert.AreEqual(1, spy.Appender.GetEvents().Length, "Num loggedEvents");
 				Assert.AreEqual(2, efa.Id, "efa.Id");
-				Assert.AreEqual(GetExpectedInsertOrgLogStatement("EFA"), spy.Appender.GetEvents()[0].MessageObject, "Message 2");
+				Assert.AreEqual(GetExpectedInsertOrgLogStatement("EFA"), spy.Appender.GetEvents()[0].RenderedMessage, "Message 2");
 				using (ISession s = OpenSession())
 				using (ITransaction t = s.BeginTransaction())
 				{
diff --git a/src/NHibernate.Test/Logging/LoggerProviderTest.cs b/src/NHibernate.Test/Logging/LoggerProviderTest.cs
@@ -15,7 +15,7 @@ public void LoggerProviderCanCreateLoggers()
 		[Test]
 		public void WhenNotConfiguredAndLog4NetExistsThenUseLog4NetFactory()
 		{
-			Assert.That(LoggerProvider.LoggerFor("pizza"), Is.InstanceOf<Log4NetLogger>());
+			Assert.That(LoggerProvider.LoggerFor("pizza"), Is.Not.InstanceOf<NoLoggingInternalLogger>());
 		}
 	}
 }
diff --git a/src/NHibernate.Test/NHSpecificTest/CriteriaFromHql/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/CriteriaFromHql/Fixture.cs
@@ -36,7 +36,7 @@ join fetch c.Children gc
 where p.Parent is null")
 					.UniqueResult<Person>();
 
-				string hqlQuery = spy.Appender.GetEvents()[0].MessageObject.ToString();
+				string hqlQuery = spy.Appender.GetEvents()[0].RenderedMessage;
 				Debug.WriteLine("HQL: " + hqlQuery);
 				Assertions(result);
 			}
@@ -50,7 +50,7 @@ join fetch c.Children gc
 					.SetFetchMode("Children", FetchMode.Join)
 					.SetFetchMode("Children.Children", FetchMode.Join)
 					.UniqueResult<Person>();
-				string criteriaQuery = spy.Appender.GetEvents()[0].MessageObject.ToString();
+				string criteriaQuery = spy.Appender.GetEvents()[0].RenderedMessage;
 				Debug.WriteLine("Criteria: " + criteriaQuery);
 				Assertions(result);
 			}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1144/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1144/Fixture.cs
@@ -53,7 +53,7 @@ public void CanSaveInSingleBatch()
 						tx.Commit();
 						foreach (LoggingEvent loggingEvent in spy.Appender.GetEvents())
 						{
-							if ("Executing batch".Equals(loggingEvent.MessageObject))
+							if ("Executing batch".Equals(loggingEvent.RenderedMessage))
 							{
 								executedBatch = true;
 								break;
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1347/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1347/Fixture.cs
@@ -39,7 +39,7 @@ public void Bug()
 					.UniqueResult<A>();
 				Assert.AreEqual("1", a.Name);
 				Assert.IsTrue(
-					spy.Appender.GetEvents()[0].MessageObject.ToString().Contains("limit")
+					spy.Appender.GetEvents()[0].RenderedMessage.Contains("limit")
 					);
 			}
 
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1587/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1587/Fixture.cs
@@ -25,7 +25,7 @@ public void Bug()
 				cfg.BuildSessionFactory();
 				foreach (LoggingEvent loggingEvent in ls.Appender.GetEvents())
 				{
-					if (((string)(loggingEvent.MessageObject)).StartsWith("Create Instantiator using optimizer"))
+					if (loggingEvent.RenderedMessage.StartsWith("Create Instantiator using optimizer"))
 					{
 						useOptimizer = true;
 						break;
@@ -35,4 +35,4 @@ public void Bug()
 			Assert.That(useOptimizer);
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/SqlTest/Identity/IdentityInsertWithStoredProcsTest.cs b/src/NHibernate.Test/SqlTest/Identity/IdentityInsertWithStoredProcsTest.cs
@@ -40,7 +40,7 @@ public void InsertUsesStoredProc()
 
 				Assert.AreEqual(1, spy.Appender.GetEvents().Length, "Num loggedEvents");
 				Assert.AreEqual(1, ifa.Id, "ifa.Id");
-				Assert.AreEqual(GetExpectedInsertOrgLogStatement("IFA"), spy.Appender.GetEvents()[0].MessageObject, "Message 1");
+				Assert.AreEqual(GetExpectedInsertOrgLogStatement("IFA"), spy.Appender.GetEvents()[0].RenderedMessage, "Message 1");
 				using (ISession s = OpenSession())
 				using (ITransaction t = s.BeginTransaction())
 				{
@@ -62,7 +62,7 @@ public void InsertUsesStoredProc()
 
 				Assert.AreEqual(1, spy.Appender.GetEvents().Length, "Num loggedEvents");
 				Assert.AreEqual(2, efa.Id, "efa.Id");
-				Assert.AreEqual(GetExpectedInsertOrgLogStatement("EFA"), spy.Appender.GetEvents()[0].MessageObject, "Message 2");
+				Assert.AreEqual(GetExpectedInsertOrgLogStatement("EFA"), spy.Appender.GetEvents()[0].RenderedMessage, "Message 2");
 				using (ISession s = OpenSession())
 				using (ITransaction t = s.BeginTransaction())
 				{

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public async Task CanSaveInSingleBatchAsync()`
`64`	`64`	`await (tx.CommitAsync());`
`65`	`65`	`foreach (LoggingEvent loggingEvent in spy.Appender.GetEvents())`
`66`	`66`	`{`
`67`		`- if ("Executing batch".Equals(loggingEvent.MessageObject))`
	`67`	`+ if ("Executing batch".Equals(loggingEvent.RenderedMessage))`
`68`	`68`	`{`
`69`	`69`	`executedBatch = true;`
`70`	`70`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public async Task BugAsync()`
`49`	`49`	`.UniqueResultAsync<A>());`
`50`	`50`	`Assert.AreEqual("1", a.Name);`
`51`	`51`	`Assert.IsTrue(`
`52`		`- spy.Appender.GetEvents()[0].MessageObject.ToString().Contains("limit")`
	`52`	`+ spy.Appender.GetEvents()[0].RenderedMessage.Contains("limit")`
`53`	`53`	`);`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public void LoggerProviderCanCreateLoggers()`
`15`	`15`	`[Test]`
`16`	`16`	`public void WhenNotConfiguredAndLog4NetExistsThenUseLog4NetFactory()`
`17`	`17`	`{`
`18`		`- Assert.That(LoggerProvider.LoggerFor("pizza"), Is.InstanceOf<Log4NetLogger>());`
	`18`	`+ Assert.That(LoggerProvider.LoggerFor("pizza"), Is.Not.InstanceOf<NoLoggingInternalLogger>());`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void CanSaveInSingleBatch()`
`53`	`53`	`tx.Commit();`
`54`	`54`	`foreach (LoggingEvent loggingEvent in spy.Appender.GetEvents())`
`55`	`55`	`{`
`56`		`- if ("Executing batch".Equals(loggingEvent.MessageObject))`
	`56`	`+ if ("Executing batch".Equals(loggingEvent.RenderedMessage))`
`57`	`57`	`{`
`58`	`58`	`executedBatch = true;`
`59`	`59`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public void Bug()`
`39`	`39`	`.UniqueResult<A>();`
`40`	`40`	`Assert.AreEqual("1", a.Name);`
`41`	`41`	`Assert.IsTrue(`
`42`		`- spy.Appender.GetEvents()[0].MessageObject.ToString().Contains("limit")`
	`42`	`+ spy.Appender.GetEvents()[0].RenderedMessage.Contains("limit")`
`43`	`43`	`);`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public void Bug()`
`25`	`25`	`cfg.BuildSessionFactory();`
`26`	`26`	`foreach (LoggingEvent loggingEvent in ls.Appender.GetEvents())`
`27`	`27`	`{`
`28`		`- if (((string)(loggingEvent.MessageObject)).StartsWith("Create Instantiator using optimizer"))`
	`28`	`+ if (loggingEvent.RenderedMessage.StartsWith("Create Instantiator using optimizer"))`
`29`	`29`	`{`
`30`	`30`	`useOptimizer = true;`
`31`	`31`	`break;`
`@@ -35,4 +35,4 @@ public void Bug()`
`35`	`35`	`Assert.That(useOptimizer);`
`36`	`36`	`}`
`37`	`37`	`}`
`38`		`-}`
	`38`	`+}`