Plan 用于 CNC 默认保存和加载，Tools 用于流程图配方 xpm，Data 用于执行结果和中间图像，Report 为报告预留目录

2026-05-06 14:56:07 +08:00
parent 9a8831c945
commit 3bee2898c5
15 changed files with 406 additions and 18 deletions
@@ -6,6 +6,7 @@ using System.Windows.Media.Imaging;
 using XP.Common.Logging.Interfaces;
 using XplorePlane.Models;
 using XplorePlane.Services;
+using XplorePlane.Services.Storage;
 using XplorePlane.Tests.Helpers;
 using XplorePlane.ViewModels;
 using Xunit;
@@ -22,6 +23,7 @@ namespace XplorePlane.Tests.Pipeline
        private readonly Mock<IPipelineExecutionService> _mockExecSvc;
        private readonly Mock<IPipelinePersistenceService> _mockPersistSvc;
        private readonly Mock<ILoggerService> _mockLogger;
+        private readonly Mock<IXpDataPathService> _mockDataPathService;

        public PipelineEditorViewModelTests()
        {
@@ -29,11 +31,19 @@ namespace XplorePlane.Tests.Pipeline
            _mockExecSvc = new Mock<IPipelineExecutionService>();
            _mockPersistSvc = new Mock<IPipelinePersistenceService>();
            _mockLogger = new Mock<ILoggerService>();
+            _mockDataPathService = new Mock<IXpDataPathService>();
            _mockLogger.Setup(l => l.ForModule<PipelineEditorViewModel>()).Returns(_mockLogger.Object);
+            _mockDataPathService.SetupGet(s => s.ToolsPath).Returns(Path.GetTempPath());
        }

        private PipelineEditorViewModel CreateVm() =>
-            new PipelineEditorViewModel(_mockImageSvc.Object, _mockExecSvc.Object, _mockPersistSvc.Object, new EventAggregator(), _mockLogger.Object);
+            new PipelineEditorViewModel(
+                _mockImageSvc.Object,
+                _mockExecSvc.Object,
+                _mockPersistSvc.Object,
+                new EventAggregator(),
+                _mockLogger.Object,
+                _mockDataPathService.Object);

        // ── 6.1 AddOperatorCommand ────────────────────────────────────

@@ -1,8 +1,10 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
+using Moq;
 using XplorePlane.Models;
 using XplorePlane.Services;
+using XplorePlane.Services.Storage;
 using XplorePlane.Tests.Helpers;
 using Xunit;

@@ -199,5 +201,21 @@ namespace XplorePlane.Tests.Pipeline

            Assert.Equal(2, result.Count);
        }
+
+        [Fact]
+        public async Task LoadAllAsync_UsesToolsPath_WhenConstructedWithDataPathService()
+        {
+            var mockImageSvc = TestHelpers.CreateMockImageService(new[] { "Blur" });
+            var mockDataPathSvc = new Mock<IXpDataPathService>();
+            mockDataPathSvc.SetupGet(s => s.ToolsPath).Returns(_tempDir);
+
+            var service = new PipelinePersistenceService(mockImageSvc.Object, mockDataPathSvc.Object);
+            await service.SaveAsync(BuildModel("P3", "Blur"), Path.Combine(_tempDir, "p3.xpm"));
+
+            var result = await service.LoadAllAsync(null);
+
+            Assert.Single(result);
+            Assert.Equal("P3", result[0].Name);
+        }
    }
-}
+}
@@ -12,6 +12,7 @@ using System.Threading.Tasks;
 using XP.Common.Logging.Interfaces;
 using XplorePlane.Models;
 using XplorePlane.Services;
+using XplorePlane.Services.Storage;
 using XplorePlane.Tests.Helpers;
 using XplorePlane.ViewModels;

@@ -31,8 +32,16 @@ namespace XplorePlane.Tests.Pipeline
            var mockExecSvc = new Mock<IPipelineExecutionService>();
            var mockPersistSvc = new Mock<IPipelinePersistenceService>();
            var mockLogger = new Mock<ILoggerService>();
+            var mockDataPathService = new Mock<IXpDataPathService>();
            mockLogger.Setup(l => l.ForModule<PipelineEditorViewModel>()).Returns(mockLogger.Object);
-            return new PipelineEditorViewModel(mockImageSvc.Object, mockExecSvc.Object, mockPersistSvc.Object, new EventAggregator(), mockLogger.Object);
+            mockDataPathService.SetupGet(s => s.ToolsPath).Returns(Path.GetTempPath());
+            return new PipelineEditorViewModel(
+                mockImageSvc.Object,
+                mockExecSvc.Object,
+                mockPersistSvc.Object,
+                new EventAggregator(),
+                mockLogger.Object,
+                mockDataPathService.Object);
        }

        /// <summary>