#0044 使用基础库层面的日志功能

XplorePlane.Tests/Pipeline/PipelineEditorViewModelTests.cs

@@ -1,5 +1,6 @@
 using Moq;
 using Xunit;
+using XP.Common.Logging.Interfaces;
 using XplorePlane.Models;
 using XplorePlane.Services;
 using XplorePlane.ViewModels;
@@ -16,16 +17,19 @@ namespace XplorePlane.Tests.Pipeline
         private readonly Mock<IImageProcessingService> _mockImageSvc;
         private readonly Mock<IPipelineExecutionService> _mockExecSvc;
         private readonly Mock<IPipelinePersistenceService> _mockPersistSvc;
+        private readonly Mock<ILoggerService> _mockLogger;
 
         public PipelineEditorViewModelTests()
         {
             _mockImageSvc = TestHelpers.CreateMockImageService();
             _mockExecSvc = new Mock<IPipelineExecutionService>();
             _mockPersistSvc = new Mock<IPipelinePersistenceService>();
+            _mockLogger = new Mock<ILoggerService>();
+            _mockLogger.Setup(l => l.ForModule<PipelineEditorViewModel>()).Returns(_mockLogger.Object);
         }
 
         private PipelineEditorViewModel CreateVm() =>
-            new PipelineEditorViewModel(_mockImageSvc.Object, _mockExecSvc.Object, _mockPersistSvc.Object);
+            new PipelineEditorViewModel(_mockImageSvc.Object, _mockExecSvc.Object, _mockPersistSvc.Object, _mockLogger.Object);
 
         // ── 6.1 AddOperatorCommand ────────────────────────────────────
 

XplorePlane.Tests/Pipeline/PipelinePropertyTests.cs

@@ -9,6 +9,7 @@ using System.Linq;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using XP.Common.Logging.Interfaces;
 using XplorePlane.Models;
 using XplorePlane.Services;
 using XplorePlane.ViewModels;
@@ -29,7 +30,9 @@ namespace XplorePlane.Tests.Pipeline
             var mockImageSvc = TestHelpers.CreateMockImageService();
             var mockExecSvc = new Mock<IPipelineExecutionService>();
             var mockPersistSvc = new Mock<IPipelinePersistenceService>();
-            return new PipelineEditorViewModel(mockImageSvc.Object, mockExecSvc.Object, mockPersistSvc.Object);
+            var mockLogger = new Mock<ILoggerService>();
+            mockLogger.Setup(l => l.ForModule<PipelineEditorViewModel>()).Returns(mockLogger.Object);
+            return new PipelineEditorViewModel(mockImageSvc.Object, mockExecSvc.Object, mockPersistSvc.Object, mockLogger.Object);
         }
 
         /// <summary>

XplorePlane.Tests/Services/AppStateServiceTests.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows;
 using Moq;
-using Serilog;
+using XP.Common.Logging.Interfaces;
 using Xunit;
 using Xunit.Abstractions;
 using XP.Hardware.RaySource.Services;
@@ -18,7 +18,7 @@ namespace XplorePlane.Tests.Services
     {
         private readonly AppStateService _service;
         private readonly Mock<IRaySourceService> _mockRaySource;
-        private readonly Mock<ILogger> _mockLogger;
+        private readonly Mock<ILoggerService> _mockLogger;
         private readonly ITestOutputHelper _output;
 
         public AppStateServiceTests(ITestOutputHelper output)
@@ -32,7 +32,8 @@ namespace XplorePlane.Tests.Services
             }
 
             _mockRaySource = new Mock<IRaySourceService>();
-            _mockLogger = new Mock<ILogger>();
+            _mockLogger = new Mock<ILoggerService>();
+            _mockLogger.Setup(l => l.ForModule<AppStateService>()).Returns(_mockLogger.Object);
             _service = new AppStateService(_mockRaySource.Object, _mockLogger.Object);
         }
 

XplorePlane.Tests/Services/RecipeServiceTests.cs

@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 using Moq;
-using Serilog;
+using XP.Common.Logging.Interfaces;
 using Xunit;
 using Xunit.Abstractions;
 using XplorePlane.Models;
@@ -20,7 +20,7 @@ namespace XplorePlane.Tests.Services
     {
         private readonly Mock<IAppStateService> _mockAppState;
         private readonly Mock<IPipelineExecutionService> _mockPipeline;
-        private readonly Mock<ILogger> _mockLogger;
+        private readonly Mock<ILoggerService> _mockLogger;
         private readonly RecipeService _service;
         private readonly ITestOutputHelper _output;
 
@@ -29,7 +29,8 @@ namespace XplorePlane.Tests.Services
             _output = output;
             _mockAppState = new Mock<IAppStateService>();
             _mockPipeline = new Mock<IPipelineExecutionService>();
-            _mockLogger = new Mock<ILogger>();
+            _mockLogger = new Mock<ILoggerService>();
+            _mockLogger.Setup(l => l.ForModule<RecipeService>()).Returns(_mockLogger.Object);
 
             // Setup default state returns
             _mockAppState.Setup(s => s.MotionState).Returns(MotionState.Default);

XplorePlane.Tests/XplorePlane.Tests.csproj

@@ -37,6 +37,10 @@
       <HintPath>..\XplorePlane\Libs\Hardware\XP.Hardware.RaySource.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="XP.Common">
+      <HintPath>..\XplorePlane\Libs\Hardware\XP.Common.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="ImageProcessing.Core">
       <HintPath>..\XplorePlane\Libs\ImageProcessing\ImageProcessing.Core.dll</HintPath>
       <Private>True</Private>