diff --git a/Chickensoft.Log.Tests/Chickensoft.Log.Tests.csproj b/Chickensoft.Log.Tests/Chickensoft.Log.Tests.csproj index dfced09..f881904 100644 --- a/Chickensoft.Log.Tests/Chickensoft.Log.Tests.csproj +++ b/Chickensoft.Log.Tests/Chickensoft.Log.Tests.csproj @@ -12,7 +12,8 @@ - + + diff --git a/Chickensoft.Log.Tests/test/src/ConsoleLogTest.cs b/Chickensoft.Log.Tests/test/src/ConsoleLogTest.cs index 7bf37e2..9eebe29 100644 --- a/Chickensoft.Log.Tests/test/src/ConsoleLogTest.cs +++ b/Chickensoft.Log.Tests/test/src/ConsoleLogTest.cs @@ -1,6 +1,7 @@ namespace Chickensoft.Log.Tests; -using Moq; +using LightMock; +using LightMock.Generator; using Shouldly; public class ConsoleLogTest { @@ -18,9 +19,9 @@ public void PrintsMessage() { var mockWriter = new Mock(); var log = new ConsoleLog(nameof(ConsoleLogTest), mockWriter.Object); log.Print(_testMsg); - mockWriter.Verify(writer => + mockWriter.Assert(writer => writer.WriteMessage($"{nameof(ConsoleLogTest)}: {_testMsg}"), - Times.Once()); + Invoked.Once); } [Fact] @@ -28,9 +29,9 @@ public void PrintsError() { var mockWriter = new Mock(); var log = new ConsoleLog(nameof(ConsoleLogTest), mockWriter.Object); log.Err(_testMsg); - mockWriter.Verify(writer => + mockWriter.Assert(writer => writer.WriteError($"{nameof(ConsoleLogTest)}: {_testMsg}"), - Times.Once()); + Invoked.Once); } [Fact] @@ -38,9 +39,9 @@ public void PrintsWarning() { var mockWriter = new Mock(); var log = new ConsoleLog(nameof(ConsoleLogTest), mockWriter.Object); log.Warn(_testMsg); - mockWriter.Verify(writer => + mockWriter.Assert(writer => writer.WriteWarning($"WARNING in {nameof(ConsoleLogTest)}: {_testMsg}"), - Times.Once()); + Invoked.Once); } [Fact] @@ -49,12 +50,12 @@ public void PrintsException() { var log = new ConsoleLog(nameof(ConsoleLogTest), mockWriter.Object); var e = new TestException(_testMsg); log.Print(e); - mockWriter.Verify(writer => + mockWriter.Assert(writer => writer.WriteError($"{nameof(ConsoleLogTest)}: An error occurred."), - Times.Once()); - mockWriter.Verify(writer => + Invoked.Once); + mockWriter.Assert(writer => writer.WriteError($"{nameof(ConsoleLogTest)}: {e}"), - Times.Once()); + Invoked.Once); } [Fact] @@ -63,9 +64,9 @@ public void PrintsStackTrace() { var log = new ConsoleLog(nameof(ConsoleLogTest), mockWriter.Object); var st = new FakeStackTrace("File.cs", "ClassName", "MethodName"); log.Print(st); - mockWriter.Verify(static writer => + mockWriter.Assert(static writer => writer.WriteError($"{nameof(ConsoleLogTest)}: ClassName.MethodName in File.cs(1,2)"), - Times.Once() + Invoked.Once ); } } diff --git a/Chickensoft.Log.Tests/test/src/FileLogTest.cs b/Chickensoft.Log.Tests/test/src/FileLogTest.cs index 2242451..e5f5970 100644 --- a/Chickensoft.Log.Tests/test/src/FileLogTest.cs +++ b/Chickensoft.Log.Tests/test/src/FileLogTest.cs @@ -1,7 +1,8 @@ namespace Chickensoft.Log.Tests; using Chickensoft.Log; -using Moq; +using LightMock; +using LightMock.Generator; using Shouldly; public class FileLogTest { @@ -19,9 +20,9 @@ public void PrintsMessage() { var mockWriter = new Mock(); var log = new FileLog(nameof(FileLogTest), mockWriter.Object); log.Print(_testMsg); - mockWriter.Verify(writer => + mockWriter.Assert(writer => writer.WriteMessage($"{nameof(FileLogTest)}: {_testMsg}"), - Times.Once()); + Invoked.Once); } [Fact] @@ -29,9 +30,9 @@ public void PrintsError() { var mockWriter = new Mock(); var log = new FileLog(nameof(FileLogTest), mockWriter.Object); log.Err(_testMsg); - mockWriter.Verify(writer => + mockWriter.Assert(writer => writer.WriteError($"ERROR in {nameof(FileLogTest)}: {_testMsg}"), - Times.Once()); + Invoked.Once); } [Fact] @@ -39,9 +40,9 @@ public void PrintsWarning() { var mockWriter = new Mock(); var log = new FileLog(nameof(FileLogTest), mockWriter.Object); log.Warn(_testMsg); - mockWriter.Verify(writer => + mockWriter.Assert(writer => writer.WriteWarning($"WARNING in {nameof(FileLogTest)}: {_testMsg}"), - Times.Once()); + Invoked.Once); } [Fact] @@ -50,12 +51,12 @@ public void PrintsException() { var log = new FileLog(nameof(FileLogTest), mockWriter.Object); var e = new TestException(_testMsg); log.Print(e); - mockWriter.Verify(writer => + mockWriter.Assert(writer => writer.WriteError($"ERROR in {nameof(FileLogTest)}: An error occurred."), - Times.Once()); - mockWriter.Verify(writer => + Invoked.Once); + mockWriter.Assert(writer => writer.WriteError($"ERROR in {nameof(FileLogTest)}: {e}"), - Times.Once()); + Invoked.Once); } [Fact] @@ -64,9 +65,9 @@ public void PrintsStackTrace() { var log = new FileLog(nameof(FileLogTest), mockWriter.Object); var st = new FakeStackTrace("File.cs", "ClassName", "MethodName"); log.Print(st); - mockWriter.Verify(static writer => + mockWriter.Assert(static writer => writer.WriteError($"ERROR in {nameof(FileLogTest)}: ClassName.MethodName in File.cs(1,2)"), - Times.Once() + Invoked.Once ); } } diff --git a/Chickensoft.Log.Tests/test/src/MultiLogTest.cs b/Chickensoft.Log.Tests/test/src/MultiLogTest.cs index 6642a60..716b4f6 100644 --- a/Chickensoft.Log.Tests/test/src/MultiLogTest.cs +++ b/Chickensoft.Log.Tests/test/src/MultiLogTest.cs @@ -2,9 +2,13 @@ namespace Chickensoft.Log.Tests; using System.Collections.Generic; using System.Linq; -using Moq; +using LightMock; +using LightMock.Generator; using Shouldly; +[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", + "IDE0090:new expression can be simplified", + Justification = "Need an explicit 'new Mock' for LightMock")] public class MultiLogTest { private readonly string _testMsg = "A test message"; @@ -16,58 +20,58 @@ public void Initializes() { [Fact] public void PrintsMessage() { - var mockLogs = new List> { new(), new() }; + var mockLogs = new List> { new Mock(), new Mock() }; var logs = (from ml in mockLogs select ml.Object).ToList(); var log = new MultiLog(logs); log.Print(_testMsg); foreach (var ml in mockLogs) { - ml.Verify(log => log.Print(_testMsg), Times.Once()); + ml.Assert(log => log.Print(_testMsg), Invoked.Once); } } [Fact] public void PrintsError() { - var mockLogs = new List> { new(), new() }; + var mockLogs = new List> { new Mock(), new Mock() }; var logs = (from ml in mockLogs select ml.Object).ToList(); var log = new MultiLog(logs); log.Err(_testMsg); foreach (var ml in mockLogs) { - ml.Verify(log => log.Err(_testMsg), Times.Once()); + ml.Assert(log => log.Err(_testMsg), Invoked.Once); } } [Fact] public void PrintsWarning() { - var mockLogs = new List> { new(), new() }; + var mockLogs = new List> { new Mock(), new Mock() }; var logs = (from ml in mockLogs select ml.Object).ToList(); var log = new MultiLog(logs); log.Warn(_testMsg); foreach (var ml in mockLogs) { - ml.Verify(log => log.Warn(_testMsg), Times.Once()); + ml.Assert(log => log.Warn(_testMsg), Invoked.Once); } } [Fact] public void PrintsException() { - var mockLogs = new List> { new(), new() }; + var mockLogs = new List> { new Mock(), new Mock() }; var logs = (from ml in mockLogs select ml.Object).ToList(); var log = new MultiLog(logs); var e = new TestException(_testMsg); log.Print(e); foreach (var ml in mockLogs) { - ml.Verify(log => log.Print(e), Times.Once()); + ml.Assert(log => log.Print(e), Invoked.Once); } } [Fact] public void PrintsStackTrace() { - var mockLogs = new List> { new(), new() }; + var mockLogs = new List> { new Mock(), new Mock() }; var logs = (from ml in mockLogs select ml.Object).ToList(); var log = new MultiLog(logs); var st = new FakeStackTrace("File.cs", "ClassName", "MethodName"); log.Print(st); foreach (var ml in mockLogs) { - ml.Verify(log => log.Print(st), Times.Once()); + ml.Assert(log => log.Print(st), Invoked.Once); } } } diff --git a/Chickensoft.Log.Tests/test/src/TraceLogTest.cs b/Chickensoft.Log.Tests/test/src/TraceLogTest.cs index b7960dc..2c1943b 100644 --- a/Chickensoft.Log.Tests/test/src/TraceLogTest.cs +++ b/Chickensoft.Log.Tests/test/src/TraceLogTest.cs @@ -1,6 +1,7 @@ namespace Chickensoft.Log.Tests; -using Moq; +using LightMock; +using LightMock.Generator; using Shouldly; public class TraceLogTest { @@ -18,9 +19,9 @@ public void PrintsMessage() { var mockWriter = new Mock(); var log = new TraceLog(nameof(TraceLogTest), mockWriter.Object); log.Print(_testMsg); - mockWriter.Verify(writer => + mockWriter.Assert(writer => writer.WriteMessage($"{nameof(TraceLogTest)}: {_testMsg}"), - Times.Once()); + Invoked.Once); } [Fact] @@ -28,9 +29,9 @@ public void PrintsError() { var mockWriter = new Mock(); var log = new TraceLog(nameof(TraceLogTest), mockWriter.Object); log.Err(_testMsg); - mockWriter.Verify(writer => + mockWriter.Assert(writer => writer.WriteError($"{nameof(TraceLogTest)}: {_testMsg}"), - Times.Once()); + Invoked.Once); } [Fact] @@ -38,9 +39,9 @@ public void PrintsWarning() { var mockWriter = new Mock(); var log = new TraceLog(nameof(TraceLogTest), mockWriter.Object); log.Warn(_testMsg); - mockWriter.Verify(writer => + mockWriter.Assert(writer => writer.WriteWarning($"WARNING in {nameof(TraceLogTest)}: {_testMsg}"), - Times.Once()); + Invoked.Once); } [Fact] @@ -49,12 +50,12 @@ public void PrintsException() { var log = new TraceLog(nameof(TraceLogTest), mockWriter.Object); var e = new TestException(_testMsg); log.Print(e); - mockWriter.Verify(writer => + mockWriter.Assert(writer => writer.WriteError($"{nameof(TraceLogTest)}: An error occurred."), - Times.Once()); - mockWriter.Verify(writer => + Invoked.Once); + mockWriter.Assert(writer => writer.WriteError($"{nameof(TraceLogTest)}: {e}"), - Times.Once()); + Invoked.Once); } [Fact] @@ -63,9 +64,9 @@ public void PrintsStackTrace() { var log = new TraceLog(nameof(TraceLogTest), mockWriter.Object); var st = new FakeStackTrace("File.cs", "ClassName", "MethodName"); log.Print(st); - mockWriter.Verify(static writer => + mockWriter.Assert(static writer => writer.WriteError($"{nameof(TraceLogTest)}: ClassName.MethodName in File.cs(1,2)"), - Times.Once() + Invoked.Once ); } }