NH-4019 - Pass assembly into log4net functions because it does not have access to Assembly.GetCallingAssembly() in .netstandard version.

ngbrown · fredericDelaporte · commit e49268c13bdf · 2017-05-30T11:16:58.000+02:00
diff --git a/src/NHibernate.Test/FilterTest/ConfigFixture.cs b/src/NHibernate.Test/FilterTest/ConfigFixture.cs
@@ -242,7 +242,7 @@ public void FilterDefWithoutReference()
 			var cfg = GetConfiguration();
 			cfg.AddXmlString(filterDef);
 		    var memoryAppender = new MemoryAppender();
-		    BasicConfigurator.Configure(memoryAppender);
+		    BasicConfigurator.Configure(LogManager.GetRepository(typeof(ConfigFixture).Assembly), memoryAppender);
             try
 			{
 			    cfg.BuildSessionFactory();
diff --git a/src/NHibernate.Test/IdTest/AssignedFixture.cs b/src/NHibernate.Test/IdTest/AssignedFixture.cs
@@ -43,7 +43,7 @@ protected override void OnTearDown()
 		[Test]
 		public void SaveOrUpdate_Save()
 		{
-			using (LogSpy ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))
+			using (LogSpy ls = new LogSpy(LogManager.GetLogger(typeof(AssignedFixture).Assembly, "NHibernate"), Level.Warn))
 			using (ISession s = OpenSession())
 			{
 				ITransaction t = s.BeginTransaction();
@@ -70,7 +70,7 @@ public void SaveOrUpdate_Save()
 		[Test]
 		public void SaveNoWarning()
 		{
-			using (LogSpy ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))
+			using (LogSpy ls = new LogSpy(LogManager.GetLogger(typeof(AssignedFixture).Assembly, "NHibernate"), Level.Warn))
 			using (ISession s = OpenSession())
 			{
 				ITransaction t = s.BeginTransaction();
@@ -104,7 +104,7 @@ public void SaveOrUpdate_Update()
 				t.Commit();
 			}
 
-			using (LogSpy ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))
+			using (LogSpy ls = new LogSpy(LogManager.GetLogger(typeof(AssignedFixture).Assembly, "NHibernate"), Level.Warn))
 			using (ISession s = OpenSession())
 			{
 				ITransaction t = s.BeginTransaction();
@@ -142,7 +142,7 @@ public void UpdateNoWarning()
 				t.Commit();
 			}
 
-			using (LogSpy ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))
+			using (LogSpy ls = new LogSpy(LogManager.GetLogger(typeof(AssignedFixture).Assembly, "NHibernate"), Level.Warn))
 			using (ISession s = OpenSession())
 			{
 				ITransaction t = s.BeginTransaction();
@@ -179,7 +179,7 @@ public void InsertCascade()
 				t.Commit();
 			}
 
-			using (LogSpy ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))
+			using (LogSpy ls = new LogSpy(LogManager.GetLogger(typeof(AssignedFixture).Assembly, "NHibernate"), Level.Warn))
 			using (ISession s = OpenSession())
 			{
 				ITransaction t = s.BeginTransaction();
@@ -218,7 +218,7 @@ public void InsertCascadeNoWarning()
 				t.Commit();
 			}
 
-			using (LogSpy ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))
+			using (LogSpy ls = new LogSpy(LogManager.GetLogger(typeof(AssignedFixture).Assembly, "NHibernate"), Level.Warn))
 			using (ISession s = OpenSession())
 			{
 				ITransaction t = s.BeginTransaction();
diff --git a/src/NHibernate.Test/LogSpy.cs b/src/NHibernate.Test/LogSpy.cs
@@ -40,8 +40,8 @@ public LogSpy(ILog log) : this(log, false) { }
 		public LogSpy(System.Type loggerType) : this(LogManager.GetLogger(loggerType), false) { }
 		public LogSpy(System.Type loggerType, bool disable) : this(LogManager.GetLogger(loggerType), disable) { }
 
-		public LogSpy(string loggerName) : this(LogManager.GetLogger(loggerName), false) { }
-		public LogSpy(string loggerName, bool disable) : this(LogManager.GetLogger(loggerName), disable) { }
+		public LogSpy(string loggerName) : this(LogManager.GetLogger(typeof(LogSpy).Assembly, loggerName), false) { }
+		public LogSpy(string loggerName, bool disable) : this(LogManager.GetLogger(typeof(LogSpy).Assembly, loggerName), disable) { }
 
 		public MemoryAppender Appender
 		{
diff --git a/src/NHibernate.Test/NHSpecificTest/Logs/LogsFixture.cs b/src/NHibernate.Test/NHSpecificTest/Logs/LogsFixture.cs
@@ -68,7 +68,7 @@ public TextLogSpy(string loggerName, string pattern)
 					Threshold = Level.All,
 					Writer = new StringWriter(stringBuilder)
 				};
-				loggerImpl = (Logger)LogManager.GetLogger(loggerName).Logger;
+				loggerImpl = (Logger)LogManager.GetLogger(typeof(LogsFixture).Assembly, loggerName).Logger;
 				loggerImpl.AddAppender(appender);
 				loggerImpl.Level = Level.All;
 			}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1093/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1093/Fixture.cs
@@ -83,7 +83,7 @@ private void NormalList()
 		protected override void BuildSessionFactory()
 		{
 			// Without configured cache, should log warn.
-			using (var ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))
+			using (var ls = new LogSpy(LogManager.GetLogger(typeof(Fixture).Assembly, "NHibernate"), Level.Warn))
 			{
 				base.BuildSessionFactory();
 				Assert.That(ls.GetWholeLog(), Does.Contain("Fake cache used"));
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1587/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1587/Fixture.cs
@@ -1,3 +1,4 @@
+using log4net;
 using log4net.Config;
 using log4net.Core;
 using NHibernate.Cfg;
@@ -11,7 +12,7 @@ public class Fixture
 		[Test]
 		public void Bug()
 		{
-			XmlConfigurator.Configure();
+			XmlConfigurator.Configure(LogManager.GetRepository(typeof(Fixture).Assembly));
 			var cfg = new Configuration();
 			if (TestConfigurationHelper.hibernateConfigFile != null)
 				cfg.Configure(TestConfigurationHelper.hibernateConfigFile);
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2386/Test.cs b/src/NHibernate.Test/NHSpecificTest/NH2386/Test.cs
@@ -18,7 +18,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
 
         protected override void OnTearDown() {
             if (memoryAppender != null) {
-                var repository = (Hierarchy) LogManager.GetRepository();
+                var repository = (Hierarchy) LogManager.GetRepository(typeof(Test).Assembly);
                 repository.Root.RemoveAppender(memoryAppender);
                 memoryAppender = null;
             }
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2779/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2779/Fixture.cs
@@ -20,7 +20,7 @@ public void Test()
 
 			using (var session = OpenSession())
 			using (var tx = session.BeginTransaction())
-			using (new LogSpy(LogManager.GetLogger("NHibernate"), Level.All)) //  <-- Logging must be set DEBUG to reproduce bug
+			using (new LogSpy(LogManager.GetLogger(typeof(Fixture).Assembly, "NHibernate"), Level.All)) //  <-- Logging must be set DEBUG to reproduce bug
 			{
 				Order order = session.Get<Order>("Order-1");
 				Assert.IsNotNull(order);
diff --git a/src/NHibernate.Test/TestCase.cs b/src/NHibernate.Test/TestCase.cs
@@ -13,8 +13,10 @@
 using NUnit.Framework;
 using NHibernate.Hql.Ast.ANTLR;
 using System.Collections.Concurrent;
+using System.IO;
 using NUnit.Framework.Interfaces;
 using System.Text;
+using log4net.Util;
 using static NUnit.Framework.TestContext;
 
 namespace NHibernate.Test
@@ -68,7 +70,7 @@ protected virtual string MappingsAssembly
 		static TestCase()
 		{
 			// Configure log4net here since configuration through an attribute doesn't always work.
-			XmlConfigurator.Configure();
+			XmlConfigurator.Configure(LogManager.GetRepository(typeof(TestCase).Assembly));
 		}
 
 		/// <summary>
diff --git a/src/NHibernate.Test/TypesTest/TypeFactoryFixture.cs b/src/NHibernate.Test/TypesTest/TypeFactoryFixture.cs
@@ -14,7 +14,7 @@ public class TypeFactoryFixture
 	{
 		public TypeFactoryFixture()
 		{
-			log4net.Config.XmlConfigurator.Configure();
+			log4net.Config.XmlConfigurator.Configure(LogManager.GetRepository(typeof(TypeFactoryFixture).Assembly));
 		}
 
 		private static readonly ILog log = LogManager.GetLogger(typeof(TypeFactoryFixture));
diff --git a/src/NHibernate.Test/UtilityTest/ThreadSafeDictionaryFixture.cs b/src/NHibernate.Test/UtilityTest/ThreadSafeDictionaryFixture.cs
@@ -12,7 +12,7 @@ public class ThreadSafeDictionaryFixture
 	{
 		public ThreadSafeDictionaryFixture()
 		{
-			log4net.Config.XmlConfigurator.Configure();
+			log4net.Config.XmlConfigurator.Configure(LogManager.GetRepository(typeof(ThreadSafeDictionaryFixture).Assembly));
 		}
 
 		private static readonly ILog log = LogManager.GetLogger(typeof(ThreadSafeDictionaryFixture));
diff --git a/src/NHibernate/Logging.cs b/src/NHibernate/Logging.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 using NHibernate.Util;
 
 namespace NHibernate
@@ -222,16 +223,16 @@ public void WarnFormat(string format, params object[] args)
 	public class Log4NetLoggerFactory: ILoggerFactory
 	{
 		private static readonly System.Type LogManagerType = System.Type.GetType("log4net.LogManager, log4net");
-		private static readonly Func<string, object> GetLoggerByNameDelegate;
+		private static readonly Func<Assembly, string, object> GetLoggerByNameDelegate;
 		private static readonly Func<System.Type, object> GetLoggerByTypeDelegate;
 		static Log4NetLoggerFactory()
 		{
-			GetLoggerByNameDelegate = GetGetLoggerMethodCall<string>();
+			GetLoggerByNameDelegate = GetGetLoggerByNameMethodCall();
 			GetLoggerByTypeDelegate = GetGetLoggerMethodCall<System.Type>();
 		}
 		public IInternalLogger LoggerFor(string keyName)
 		{
-			return new Log4NetLogger(GetLoggerByNameDelegate(keyName));
+			return new Log4NetLogger(GetLoggerByNameDelegate(typeof(Log4NetLoggerFactory).Assembly, keyName));
 		}
 
 		public IInternalLogger LoggerFor(System.Type type)
@@ -247,6 +248,15 @@ private static Func<TParameter, object> GetGetLoggerMethodCall<TParameter>()
 			MethodCallExpression methodCall = Expression.Call(null, method, resultValue = keyParam);
 			return Expression.Lambda<Func<TParameter, object>>(methodCall, resultValue).Compile();
 		}
+
+		private static Func<Assembly, string, object> GetGetLoggerByNameMethodCall()
+		{
+			var method = LogManagerType.GetMethod("GetLogger", new[] {typeof(Assembly), typeof(string)});
+			ParameterExpression nameParam = Expression.Parameter(typeof(string), "name");
+			ParameterExpression repositoryAssemblyParam = Expression.Parameter(typeof(Assembly), "repositoryAssembly");
+			MethodCallExpression methodCall = Expression.Call(null, method, repositoryAssemblyParam, nameParam);
+			return Expression.Lambda<Func<Assembly, string, object>>(methodCall, repositoryAssemblyParam, nameParam).Compile();
+		}
 	}
 
 	public class Log4NetLogger: IInternalLogger

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ public void FilterDefWithoutReference()`
`242`	`242`	`var cfg = GetConfiguration();`
`243`	`243`	`cfg.AddXmlString(filterDef);`
`244`	`244`	`var memoryAppender = new MemoryAppender();`
`245`		`- BasicConfigurator.Configure(memoryAppender);`
	`245`	`+ BasicConfigurator.Configure(LogManager.GetRepository(typeof(ConfigFixture).Assembly), memoryAppender);`
`246`	`246`	`try`
`247`	`247`	`{`
`248`	`248`	`cfg.BuildSessionFactory();`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ protected override void OnTearDown()`
`43`	`43`	`[Test]`
`44`	`44`	`public void SaveOrUpdate_Save()`
`45`	`45`	`{`
`46`		`- using (LogSpy ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))`
	`46`	`+ using (LogSpy ls = new LogSpy(LogManager.GetLogger(typeof(AssignedFixture).Assembly, "NHibernate"), Level.Warn))`
`47`	`47`	`using (ISession s = OpenSession())`
`48`	`48`	`{`
`49`	`49`	`ITransaction t = s.BeginTransaction();`
`@@ -70,7 +70,7 @@ public void SaveOrUpdate_Save()`
`70`	`70`	`[Test]`
`71`	`71`	`public void SaveNoWarning()`
`72`	`72`	`{`
`73`		`- using (LogSpy ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))`
	`73`	`+ using (LogSpy ls = new LogSpy(LogManager.GetLogger(typeof(AssignedFixture).Assembly, "NHibernate"), Level.Warn))`
`74`	`74`	`using (ISession s = OpenSession())`
`75`	`75`	`{`
`76`	`76`	`ITransaction t = s.BeginTransaction();`
`@@ -104,7 +104,7 @@ public void SaveOrUpdate_Update()`
`104`	`104`	`t.Commit();`
`105`	`105`	`}`
`106`	`106`
`107`		`- using (LogSpy ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))`
	`107`	`+ using (LogSpy ls = new LogSpy(LogManager.GetLogger(typeof(AssignedFixture).Assembly, "NHibernate"), Level.Warn))`
`108`	`108`	`using (ISession s = OpenSession())`
`109`	`109`	`{`
`110`	`110`	`ITransaction t = s.BeginTransaction();`
`@@ -142,7 +142,7 @@ public void UpdateNoWarning()`
`142`	`142`	`t.Commit();`
`143`	`143`	`}`
`144`	`144`
`145`		`- using (LogSpy ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))`
	`145`	`+ using (LogSpy ls = new LogSpy(LogManager.GetLogger(typeof(AssignedFixture).Assembly, "NHibernate"), Level.Warn))`
`146`	`146`	`using (ISession s = OpenSession())`
`147`	`147`	`{`
`148`	`148`	`ITransaction t = s.BeginTransaction();`
`@@ -179,7 +179,7 @@ public void InsertCascade()`
`179`	`179`	`t.Commit();`
`180`	`180`	`}`
`181`	`181`
`182`		`- using (LogSpy ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))`
	`182`	`+ using (LogSpy ls = new LogSpy(LogManager.GetLogger(typeof(AssignedFixture).Assembly, "NHibernate"), Level.Warn))`
`183`	`183`	`using (ISession s = OpenSession())`
`184`	`184`	`{`
`185`	`185`	`ITransaction t = s.BeginTransaction();`
`@@ -218,7 +218,7 @@ public void InsertCascadeNoWarning()`
`218`	`218`	`t.Commit();`
`219`	`219`	`}`
`220`	`220`
`221`		`- using (LogSpy ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))`
	`221`	`+ using (LogSpy ls = new LogSpy(LogManager.GetLogger(typeof(AssignedFixture).Assembly, "NHibernate"), Level.Warn))`
`222`	`222`	`using (ISession s = OpenSession())`
`223`	`223`	`{`
`224`	`224`	`ITransaction t = s.BeginTransaction();`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ public LogSpy(ILog log) : this(log, false) { }`
`40`	`40`	`public LogSpy(System.Type loggerType) : this(LogManager.GetLogger(loggerType), false) { }`
`41`	`41`	`public LogSpy(System.Type loggerType, bool disable) : this(LogManager.GetLogger(loggerType), disable) { }`
`42`	`42`
`43`		`- public LogSpy(string loggerName) : this(LogManager.GetLogger(loggerName), false) { }`
`44`		`- public LogSpy(string loggerName, bool disable) : this(LogManager.GetLogger(loggerName), disable) { }`
	`43`	`+ public LogSpy(string loggerName) : this(LogManager.GetLogger(typeof(LogSpy).Assembly, loggerName), false) { }`
	`44`	`+ public LogSpy(string loggerName, bool disable) : this(LogManager.GetLogger(typeof(LogSpy).Assembly, loggerName), disable) { }`
`45`	`45`
`46`	`46`	`public MemoryAppender Appender`
`47`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public TextLogSpy(string loggerName, string pattern)`
`68`	`68`	`Threshold = Level.All,`
`69`	`69`	`Writer = new StringWriter(stringBuilder)`
`70`	`70`	`};`
`71`		`- loggerImpl = (Logger)LogManager.GetLogger(loggerName).Logger;`
	`71`	`+ loggerImpl = (Logger)LogManager.GetLogger(typeof(LogsFixture).Assembly, loggerName).Logger;`
`72`	`72`	`loggerImpl.AddAppender(appender);`
`73`	`73`	`loggerImpl.Level = Level.All;`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ private void NormalList()`
`83`	`83`	`protected override void BuildSessionFactory()`
`84`	`84`	`{`
`85`	`85`	`// Without configured cache, should log warn.`
`86`		`- using (var ls = new LogSpy(LogManager.GetLogger("NHibernate"), Level.Warn))`
	`86`	`+ using (var ls = new LogSpy(LogManager.GetLogger(typeof(Fixture).Assembly, "NHibernate"), Level.Warn))`
`87`	`87`	`{`
`88`	`88`	`base.BuildSessionFactory();`
`89`	`89`	`Assert.That(ls.GetWholeLog(), Does.Contain("Fake cache used"));`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)`
`18`	`18`
`19`	`19`	`protected override void OnTearDown() {`
`20`	`20`	`if (memoryAppender != null) {`
`21`		`- var repository = (Hierarchy) LogManager.GetRepository();`
	`21`	`+ var repository = (Hierarchy) LogManager.GetRepository(typeof(Test).Assembly);`
`22`	`22`	`repository.Root.RemoveAppender(memoryAppender);`
`23`	`23`	`memoryAppender = null;`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public void Test()`
`20`	`20`
`21`	`21`	`using (var session = OpenSession())`
`22`	`22`	`using (var tx = session.BeginTransaction())`
`23`		`- using (new LogSpy(LogManager.GetLogger("NHibernate"), Level.All)) // <-- Logging must be set DEBUG to reproduce bug`
	`23`	`+ using (new LogSpy(LogManager.GetLogger(typeof(Fixture).Assembly, "NHibernate"), Level.All)) // <-- Logging must be set DEBUG to reproduce bug`
`24`	`24`	`{`
`25`	`25`	`Order order = session.Get<Order>("Order-1");`
`26`	`26`	`Assert.IsNotNull(order);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class TypeFactoryFixture`
`14`	`14`	`{`
`15`	`15`	`public TypeFactoryFixture()`
`16`	`16`	`{`
`17`		`- log4net.Config.XmlConfigurator.Configure();`
	`17`	`+ log4net.Config.XmlConfigurator.Configure(LogManager.GetRepository(typeof(TypeFactoryFixture).Assembly));`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`private static readonly ILog log = LogManager.GetLogger(typeof(TypeFactoryFixture));`