Initialize LogMessage from old LogMessage

with new message only uses LogType from old message for now but more coming
sarbian · Apr 30, 2019 · fc74f1f · fc74f1f
1 parent d4d0fb7
commit fc74f1f
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/ModuleManager/Logging/LogMessage.cs b/ModuleManager/Logging/LogMessage.cs
@@ -16,6 +16,13 @@ public LogMessage(LogType logType, string message)
             Message = message ?? throw new ArgumentNullException(nameof(message));
         }
 
+        public LogMessage(ILogMessage logMessage, string newMessage)
+        {
+            if (logMessage == null) throw new ArgumentNullException(nameof(logMessage));
+            LogType = logMessage.LogType;
+            Message = newMessage ?? throw new ArgumentNullException(nameof(newMessage));
+        }
+
         public string ToLogString()
         {
             string prefix;

diff --git a/ModuleManager/Logging/ModLogger.cs b/ModuleManager/Logging/ModLogger.cs
@@ -17,7 +17,7 @@ public ModLogger(string prefix, IBasicLogger logger)
         public void Log(ILogMessage message)
         {
             if (message == null) throw new ArgumentNullException(nameof(message));
-            logger.Log(new LogMessage(message.LogType, prefix + message.Message));
+            logger.Log(new LogMessage(message, prefix + message.Message));
         }
     }
 }
diff --git a/ModuleManagerTests/Logging/LogMessageTest.cs b/ModuleManagerTests/Logging/LogMessageTest.cs
@@ -1,5 +1,6 @@
 using System;
 using Xunit;
+using NSubstitute;
 using UnityEngine;
 using ModuleManager.Logging;
 
@@ -18,6 +19,39 @@ public void TestConstructor__NullMessage()
             Assert.Equal("message", ex.ParamName);
         }
 
+        [Fact]
+        public void TestConstructor__FromOtherMessage()
+        {
+            ILogMessage logMessage = Substitute.For<ILogMessage>();
+            logMessage.LogType.Returns(LogType.Log);
+            logMessage.Message.Returns("the old message");
+            LogMessage newLogMessage = new LogMessage(logMessage, "a new message");
+            Assert.Equal(LogType.Log, newLogMessage.LogType);
+            Assert.Equal("a new message", newLogMessage.Message);
+        }
+
+        [Fact]
+        public void TestConstructor__FromOtherMessage__LogMessageNull()
+        {
+            ArgumentNullException ex = Assert.Throws<ArgumentNullException>(delegate
+            {
+                new LogMessage(null, "a new message");
+            });
+
+            Assert.Equal("logMessage", ex.ParamName);
+        }
+
+        [Fact]
+        public void TestConstructor__FromOtherMessage__NewMessageNull()
+        {
+            ArgumentNullException ex = Assert.Throws<ArgumentNullException>(delegate
+            {
+                new LogMessage(Substitute.For<ILogMessage>(), null);
+            });
+
+            Assert.Equal("newMessage", ex.ParamName);
+        }
+
         [Fact]
         public void TestToLogMessage__Info()
         {