#27 モックの名前、位置の修正

KoeBook.Core/Contracts/Services/ISoundGenerationSelectorService.cs

@@ -1,4 +1,6 @@
-namespace KoeBook.Core.Contracts.Services;
+using KoeBook.Core.Models;
+
+namespace KoeBook.Core.Contracts.Services;
 
 public interface ISoundGenerationSelectorService
 {
@@ -9,5 +11,3 @@ public interface ISoundGenerationSelectorService
 
     public ValueTask InitializeAsync(CancellationToken cancellationToken);
 }
-
-public record SoundModel(string name, string[] styles);

KoeBook.Core/Contracts/Services/ISoundGeneration.cs → KoeBook.Core/Contracts/Services/ISoundGenerationService.cs

@@ -2,7 +2,7 @@
 
 namespace KoeBook.Core.Contracts.Services;
 
-internal interface ISoundGeneration
+public interface ISoundGenerationService
 {
     /// <summary>
     /// 1文の音声を生成します

KoeBook.Core/KoeBook.Core.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>KoeBook.Core</RootNamespace>

KoeBook.Core/Models/SoundModel.cs

@@ -0,0 +1,5 @@
+namespace KoeBook.Core.Models;
+
+public record SoundModel(
+    string name,
+    IReadOnlyList<string> styles);

KoeBook.Core/Services/Mocks/SoundGenerationSelectorServiceMock.cs

@@ -0,0 +1,22 @@
+using KoeBook.Core.Contracts.Services;
+using KoeBook.Core.Models;
+
+namespace KoeBook.Core.Services.Mocks;
+
+internal class SoundGenerationSelectorServiceMock : ISoundGenerationSelectorService
+{
+    public IReadOnlyList<SoundModel> Models { get; private set; } = [];
+
+    public async ValueTask InitializeAsync(CancellationToken cancellationToken)
+    {
+        await Task.Delay(1000, cancellationToken).ConfigureAwait(false);
+        Models = [
+            new SoundModel("青年1", ["neutral", "laughing", "happy", "sad", "cry", "surprised", "angry"]),
+            new SoundModel("青年2", ["neutral", "laughing", "happy", "sad", "cry", "surprised", "angry"]),
+            new SoundModel("女性1", ["neutral", "laughing", "happy", "sad", "cry", "surprised", "angry"]),
+            new SoundModel("女性2", ["neutral", "laughing", "happy", "sad", "cry", "surprised", "angry"]),
+            new SoundModel("ナレーション (男性)", ["narration"]),
+            new SoundModel("ナレーション (女性)", ["narration"]),
+        ];
+    }
+}

KoeBook/Contracts/Services/Mocks/SoundGenerationMock.cs → KoeBook.Core/Services/Mocks/SoundGenerationServiceMock.cs

@@ -1,12 +1,13 @@
-using KoeBook.Core.Models;
+using KoeBook.Core.Contracts.Services;
+using KoeBook.Core.Models;
 
-namespace KoeBook.Contracts.Services.Mocks;
+namespace KoeBook.Core.Services.Mocks;
 
-internal class SoundGenerationMock
+public class SoundGenerationServiceMock : ISoundGenerationService
 {
     public async ValueTask<byte[]> GenerateLineSoundAsync(ScriptLine scriptLine, BookOptions bookOptions, CancellationToken cancellationToken)
     {
-        await Task.Delay(1000, cancellationToken);
+        await Task.Delay(1000, cancellationToken).ConfigureAwait(false);
         // 適当なバイト列を返す
         var random = new Random();
         var buffer = new byte[44100 * 2];

KoeBook/App.xaml.cs

@@ -3,13 +3,13 @@
 using KoeBook.Contracts.Services;
 using KoeBook.Core.Contracts.Services;
 using KoeBook.Core.Services;
-using KoeBook.Helpers;
+using KoeBook.Core.Services.Mocks;
 using KoeBook.Models;
 using KoeBook.Notifications;
 using KoeBook.Services;
 using KoeBook.ViewModels;
 using KoeBook.Views;
-
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.UI.Xaml;
@@ -86,6 +86,13 @@ public App()
 
                 // Configuration
                 services.Configure<LocalSettingsOptions>(context.Configuration.GetSection(nameof(LocalSettingsOptions)));
+
+                // Core Services Mock
+                var mockOptions = context.Configuration.GetSection(nameof(MockOptions)).Get<MockOptions>();
+                if (mockOptions.ISoundGenerationSelectorService.HasValue && mockOptions.ISoundGenerationSelectorService.Value)
+                    services.AddSingleton<ISoundGenerationSelectorService, SoundGenerationSelectorServiceMock>();
+                if(mockOptions.ISoundGenerationService.HasValue && mockOptions.ISoundGenerationService.Value)
+                    services.AddSingleton<ISoundGenerationService, SoundGenerationServiceMock>();
             })
             .Build();
 

KoeBook/KoeBook.csproj

@@ -58,10 +58,6 @@
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <ProjectCapability Include="Msix" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Services\CoreMocks\" />
-  </ItemGroup>
 
   <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>

KoeBook/Models/MockOptions.cs

@@ -0,0 +1,8 @@
+namespace KoeBook.Models;
+
+internal class MockOptions
+{
+    public bool? ISoundGenerationSelectorService { get; set; }
+
+    public bool? ISoundGenerationService { get; set; }
+}

KoeBook/Services/CoreMocks/SoundGenerationSelectorServiceMock.cs

@@ -0,0 +1,19 @@
+using KoeBook.Core.Contracts.Services;
+using KoeBook.Core.Models;
+
+namespace KoeBook.Core.Services.Mocks;
+
+internal class SoundGenerationSelectorServiceMock : ISoundGenerationSelectorService
+{
+    public IReadOnlyList<SoundModel> Models { get; private set; } = [];
+
+    public async ValueTask InitializeAsync(CancellationToken cancellationToken)
+    {
+        await Task.Delay(1000, cancellationToken).ConfigureAwait(false);
+        Models = [
+            new SoundModel("青年1", ["neutral", "laughing", "happy", "sad", "cry", "surprised", "angry"]),
+            new SoundModel("青年2", ["neutral", "laughing", "happy", "sad", "cry", "surprised", "angry"]),
+            new SoundModel("王", ["narration", "neutral", "laughing", "happy", "sad", "cry", "surprised", "angry"]),
+        ];
+    }
+}

KoeBook/appsettings.json

@@ -1,6 +1,10 @@
-{
+{
     "LocalSettingsOptions": {
-      "ApplicationDataFolder": "KoeBook/ApplicationData",
-      "LocalSettingsFile": "LocalSettings.json"
+        "ApplicationDataFolder": "KoeBook/ApplicationData",
+        "LocalSettingsFile": "LocalSettings.json"
+    },
+    "MockOptions": {
+        "ISoundGenerationSelectorService": false,
+        "ISoundGenerationService": false
     }
 }