Unit test fixes

Author: tippmar-nr

tests/Agent/UnitTests/Core.UnitTest/Logging/LoggerTests.cs

@@ -157,8 +157,10 @@ public void Error_Exception_CallsSerilogLoggerError()
         [Test]
         public void ErrorFormat_CallsSerilogLoggerError()
         {
+            Mock.Arrange(() => _serilogLogger.IsEnabled(Arg.IsAny<LogEventLevel>())).Returns(true);
+
             _logger.ErrorFormat(_testFormat, _testArgs);
-            Mock.Assert(() => _serilogLogger.Error(Arg.AnyString), Occurs.Once());
+            Mock.Assert(() => _serilogLogger.Error(Arg.AnyString, Arg.IsAny<object[]>()), Occurs.Once());
         }
 
         // Warn methods
@@ -180,8 +182,10 @@ public void Warn_Exception_CallsSerilogLoggerWarning()
         [Test]
         public void WarnFormat_CallsSerilogLoggerWarning()
         {
+            Mock.Arrange(() => _serilogLogger.IsEnabled(Arg.IsAny<LogEventLevel>())).Returns(true);
+
             _logger.WarnFormat(_testFormat, _testArgs);
-            Mock.Assert(() => _serilogLogger.Warning(Arg.AnyString), Occurs.Once());
+            Mock.Assert(() => _serilogLogger.Warning(Arg.AnyString, Arg.IsAny<object[]>()), Occurs.Once());
         }
 
         // Info methods
@@ -203,9 +207,10 @@ public void Info_Exception_CallsSerilogLoggerInformation()
         [Test]
         public void InfoFormat_CallsSerilogLoggerInformation()
         {
+            Mock.Arrange(() => _serilogLogger.IsEnabled(Arg.IsAny<LogEventLevel>())).Returns(true);
 
             _logger.InfoFormat(_testFormat, _testArgs);
-            Mock.Assert(() => _serilogLogger.Information(Arg.AnyString), Occurs.Once());
+            Mock.Assert(() => _serilogLogger.Information(Arg.AnyString, Arg.IsAny<object[]>()), Occurs.Once());
         }
 
         // Debug methods
@@ -227,8 +232,10 @@ public void Debug_Exception_CallsSerilogLoggerDebug()
         [Test]
         public void DebugFormat_CallsSerilogLoggerDebug()
         {
+            Mock.Arrange(() => _serilogLogger.IsEnabled(Arg.IsAny<LogEventLevel>())).Returns(true);
+
             _logger.DebugFormat(_testFormat, _testArgs);
-            Mock.Assert(() => _serilogLogger.Debug(Arg.AnyString), Occurs.Once());
+            Mock.Assert(() => _serilogLogger.Debug(Arg.AnyString, Arg.IsAny<object[]>()), Occurs.Once());
         }
         [TearDown]
         public void TearDown()

tests/Agent/UnitTests/Core.UnitTest/NewRelic.Agent.Core.Config.FromLegacy/BootstrapConfigTest.cs

@@ -27,8 +27,8 @@ public void TestInvalidServiceAttribute()
                 ConfigurationLoader.InitializeFromXml(bogusConfigXml, configSchemaSource);
 
                 var errorMessage = Type.GetType("Mono.Runtime") == null ?
-                        "An error occurred parsing newrelic.config - The 'bogus' attribute is not declared." :
-                        "An error occurred parsing newrelic.config - XmlSchema error: Attribute declaration was not found for bogus";
+                        "The 'bogus' attribute is not declared" :
+                        "XmlSchema error: Attribute declaration was not found for bogus";
                 Assert.IsTrue(logging.HasMessageThatContains(errorMessage));
             }
         }
@@ -53,9 +53,7 @@ public void TestMissingOrEmptyConfigXsd()
 
                 // While this error message is somewhat cryptic, in an actual agent run it would be
                 // preceeded by a warning message regarding failure to read the schema file contents from disk
-                var errorMessage = Type.GetType("Mono.Runtime") == null ?
-                        "An error occurred parsing newrelic.config - Root element is missing." :
-                        "An error occurred parsing newrelic.config - Root element is missing.";
+                var errorMessage = "Root element is missing";
                 Assert.IsTrue(logging.HasMessageThatContains(errorMessage));
             }
         }

tests/Agent/UnitTests/Core.UnitTest/ThreadProfiling.FromLegacy/ThreadProfilingBucketTest.cs

@@ -61,7 +61,7 @@ public void verify_UpdateTree_handles_null_StackInfo_argument()
             {
                 ThreadProfilingBucket bucket = new ThreadProfilingBucket(new MockThreadProfilingService());
                 bucket.UpdateTree(null);
-                Assert.IsTrue(logging.HasMessageBeginingWith("fids passed to UpdateTree is null"));
+                Assert.IsTrue(logging.HasMessageBeginningWith("fids passed to UpdateTree is null"));
             }
         }
 

tests/Agent/UnitTests/Core.UnitTest/Wrapper/AgentWrapperApi/AgentWrapperApiTests.cs

@@ -225,7 +225,7 @@ public void EndTransaction_ShouldNotLogResponseTimeAlreadyCaptured()
             {
                 _agent.CurrentTransaction.End();
 
-                var foundResponseTimeAlreadyCapturedMessage = logging.HasMessageBeginingWith("Transaction has already captured the response time.");
+                var foundResponseTimeAlreadyCapturedMessage = logging.HasMessageBeginningWith("Transaction has already captured the response time.");
                 Assert.False(foundResponseTimeAlreadyCapturedMessage);
             }
         }

tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/Logging.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
 using NewRelic.Agent.Core.Logging;
 using Serilog.Events;
@@ -66,7 +65,7 @@ public override string ToString()
         /// </summary>
         /// <param name="segment"></param>
         /// <returns></returns>
-        public bool HasMessageBeginingWith(string segment) => _inMemorySink.LogEvents.Any(item => item.RenderMessage().StartsWith(segment));
+        public bool HasMessageBeginningWith(string segment) => _inMemorySink.LogEvents.Any(item => item.RenderMessage().StartsWith(segment));
 
         /// <summary>
         /// checks for messages that begins with a segment