From 769c677e8d605092eee6a1d79692fe56738ee53e Mon Sep 17 00:00:00 2001
From: Dominic Cerquetti <binary1230@users.noreply.github.com>
Date: Sun, 21 Jan 2024 03:02:24 -0500
Subject: [PATCH] fix unit tests

---
 ...DiztinGUIsh - WinForms Desktop (Main App).run.xml |  4 ++--
 Diz.Test/Tests/RomInterfaceTests/AccessTests.cs      |  2 +-
 Diz.Test/Tests/RomModeDetectionTests.cs              |  1 -
 Diz.Test/Utils/TestUtil.cs                           |  2 +-
 Diz.Test/bugs/Bug050_JapaneseText.cs                 | 12 +++++++++---
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.run/DiztinGUIsh - WinForms Desktop (Main App).run.xml b/.run/DiztinGUIsh - WinForms Desktop (Main App).run.xml
index 2a0eefb5..635620af 100644
--- a/.run/DiztinGUIsh - WinForms Desktop (Main App).run.xml	
+++ b/.run/DiztinGUIsh - WinForms Desktop (Main App).run.xml	
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="DiztinGUIsh - WinForms Desktop (Main App)" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/DiztinGUIsh/bin/Debug/net6.0-windows7.0/DiztinGUIsh.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/DiztinGUIsh/bin/Release/net6.0-windows7.0/DiztinGUIsh.exe" />
     <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/DiztinGUIsh/bin/Debug/net6.0-windows7.0" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/DiztinGUIsh/bin/Release/net6.0-windows7.0" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
diff --git a/Diz.Test/Tests/RomInterfaceTests/AccessTests.cs b/Diz.Test/Tests/RomInterfaceTests/AccessTests.cs
index 9e861720..5db63419 100644
--- a/Diz.Test/Tests/RomInterfaceTests/AccessTests.cs
+++ b/Diz.Test/Tests/RomInterfaceTests/AccessTests.cs
@@ -33,7 +33,7 @@ private static Data GetSampleData()
                     new() { Rom = 0x16, TypeFlag = FlagType.Operand },
                     new() { Rom = 0x21, TypeFlag = FlagType.Operand },
                 },
-                Comments = new ObservableDictionary<int, string>
+                Comments = new SortedDictionary<int, string>
                 {
                     { 0xC00001, "unused" },
                 }
diff --git a/Diz.Test/Tests/RomModeDetectionTests.cs b/Diz.Test/Tests/RomModeDetectionTests.cs
index ca7457b8..f6605ad4 100644
--- a/Diz.Test/Tests/RomModeDetectionTests.cs
+++ b/Diz.Test/Tests/RomModeDetectionTests.cs
@@ -14,7 +14,6 @@ public class RomModeDetectionTests : ContainerFixture
 {
     [Inject] private readonly IReadFromFileBytes fileReader = null!;
     [Inject] private readonly ISampleRomTestData sampleDataFixture = null!;
-    [Inject] private readonly ISnesRomAnalyzer snesRomAnalyzer = null!;
 
     protected override void Configure(IServiceRegistry serviceRegistry)
     {
diff --git a/Diz.Test/Utils/TestUtil.cs b/Diz.Test/Utils/TestUtil.cs
index 8c9ada70..5330959a 100644
--- a/Diz.Test/Utils/TestUtil.cs
+++ b/Diz.Test/Utils/TestUtil.cs
@@ -20,7 +20,7 @@ public class SampleRomTestDataFixture : ContainerFixture, ISampleRomTestData
 {
     public byte[] SampleRomBytes => sampleBytes.Value;
     
-    [Inject] private readonly ISnesSampleProjectFactory? sampleFactory = null!;
+    [Inject] private readonly ISnesSampleProjectFactory sampleFactory = null!;
     private readonly Lazy<byte[]> sampleBytes;
     public SampleRomTestDataFixture()
     {
diff --git a/Diz.Test/bugs/Bug050_JapaneseText.cs b/Diz.Test/bugs/Bug050_JapaneseText.cs
index f8a26b52..bfa5397d 100644
--- a/Diz.Test/bugs/Bug050_JapaneseText.cs
+++ b/Diz.Test/bugs/Bug050_JapaneseText.cs
@@ -18,6 +18,7 @@
 using LightInject;
 using Moq;
 using Xunit;
+using IFileByteProvider = Diz.Core.serialization.IFileByteProvider;
 
 namespace Diz.Test.bugs;
 
@@ -45,11 +46,11 @@ protected override byte[] SerializeWith(Project project, IProjectSerializer seri
     public Bug50ProjectFileManager(
         Func<IProjectXmlSerializer> projectXmlSerializerCreate,
         Func<IAddRomDataCommand> addRomDataCommandCreate,
-        IFileByteProvider fileByteIo) 
+        Func<string, IFileByteProvider> fileByteProviderFactory) 
         : base(
             projectXmlSerializerCreate, 
             addRomDataCommandCreate,
-            fileByteIo)
+            fileByteProviderFactory)
     {
     }
 }
@@ -91,7 +92,12 @@ public Bug050Fixture(
             base(injectFieldsOnlyIfNull: true, injectOnlyTaggedFields: true)
         {
             FileIo = new FileIoFixture();
-            ProjectFileManager = new Bug50ProjectFileManager(fnProjectSerializerCreate, fnAddRomDataCommand, FileIo.Mock.Object);
+
+            ProjectFileManager = new Bug50ProjectFileManager(
+                fnProjectSerializerCreate, 
+                fnAddRomDataCommand, 
+                _ => FileIo.Mock.Object
+            );
             
             ExpectedCartTitleValidationException = expectedCartTitleValidationException;
             SaveVersionToUse = forceOlderVersion100 ? 100 : 101;