diff --git a/Assets/Mirage/Runtime/LogFactory.cs b/Assets/Mirage/Runtime/LogFactory.cs index 7cac650adfb..066f3567b82 100644 --- a/Assets/Mirage/Runtime/LogFactory.cs +++ b/Assets/Mirage/Runtime/LogFactory.cs @@ -40,12 +40,12 @@ public static class ILoggerExtensions { public static void LogError(this ILogger logger, object message) { - logger.LogError(null, message); + logger.Log(LogType.Error, message); } public static void LogWarning(this ILogger logger, object message) { - logger.LogWarning(null, message); + logger.Log(LogType.Warning, message); } public static bool LogEnabled(this ILogger logger) => logger.IsLogTypeAllowed(LogType.Log); diff --git a/Assets/Tests/Editor/LogFactoryTests.cs b/Assets/Tests/Editor/LogFactoryTests.cs index 4ce1f902f17..32e9fb8c85e 100644 --- a/Assets/Tests/Editor/LogFactoryTests.cs +++ b/Assets/Tests/Editor/LogFactoryTests.cs @@ -1,4 +1,4 @@ -using NSubstitute; +using NSubstitute; using NUnit.Framework; using UnityEngine; @@ -43,8 +43,59 @@ public void LogDebugFull() ILogHandler mockHandler = Substitute.For(); logger.logHandler = mockHandler; - logger.Log("This message be logged"); - mockHandler.Received().LogFormat(LogType.Log, null, "{0}", "This message be logged"); + const string msg = "This message be logged"; + logger.Log(msg); + mockHandler.Received().LogFormat(LogType.Log, null, "{0}", msg); + } + + [Test] + public void LogWarningIgnore() + { + ILogger logger = LogFactory.GetLogger(); + logger.filterLogType = LogType.Error; + + ILogHandler mockHandler = Substitute.For(); + logger.logHandler = mockHandler; + logger.LogWarning("This message should not be logged"); + mockHandler.DidNotReceiveWithAnyArgs().LogFormat(default, null, null); + } + + [Test] + public void LogWarningFull() + { + ILogger logger = LogFactory.GetLogger(); + logger.filterLogType = LogType.Warning; + + ILogHandler mockHandler = Substitute.For(); + logger.logHandler = mockHandler; + const string msg = "This message be logged"; + logger.LogWarning(msg); + mockHandler.Received().LogFormat(LogType.Warning, null, "{0}", msg); + } + + [Test] + public void LogErrorIgnore() + { + ILogger logger = LogFactory.GetLogger(); + logger.filterLogType = LogType.Exception; + + ILogHandler mockHandler = Substitute.For(); + logger.logHandler = mockHandler; + logger.LogError("This message should not be logged"); + mockHandler.DidNotReceiveWithAnyArgs().LogFormat(default, null, null); + } + + [Test] + public void LogErrorFull() + { + ILogger logger = LogFactory.GetLogger(); + logger.filterLogType = LogType.Error; + + ILogHandler mockHandler = Substitute.For(); + logger.logHandler = mockHandler; + const string msg = "This message be logged"; + logger.LogError(msg); + mockHandler.Received().LogFormat(LogType.Error, null, "{0}", msg); } } }