Enhance autocomplete

AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj

@@ -23,10 +23,6 @@
     <PackageReference Include="MSTest" Version="3.10.4" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="Kalimba.mp3">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

AudioCuesheetEditor.End2EndTests/MSTestSettings.cs

@@ -0,0 +1 @@
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]

AudioCuesheetEditor.End2EndTests/Models/DetailView.cs

@@ -48,18 +48,22 @@ internal async Task EditTrackAsync(string? artist = null, string? title = null)
             {
                 await _page.Locator("td:nth-child(3)").ClickAsync();
                 await _page.Locator("td:nth-child(3)").Last.GetByRole(AriaRole.Textbox).FillAsync(artist);
+                // Autocomplete overlay will pop up, so we close it
                 await _page.Locator(".mud-popover-open").WaitForAsync(new() { State = WaitForSelectorState.Visible });
                 await _page.Keyboard.PressAsync("Escape");
-                await _page.GetByRole(AriaRole.Heading, new() { Name = "Playback" }).ClickAsync();
+                // Click outside the autocomplete to have an focus lost event for getting the value written to model
+                await _page.GetByRole(AriaRole.Heading, new() { Name = "Playback" }).ClickAsync(new() { Force = true });
                 await _page.WaitForTimeoutAsync(100);
             }
             if (title != null)
             {
                 await _page.Locator("td:nth-child(4)").ClickAsync();
                 await _page.Locator("td:nth-child(4)").Last.GetByRole(AriaRole.Textbox).FillAsync(title);
+                // Autocomplete overlay will pop up, so we close it
                 await _page.Locator(".mud-popover-open").WaitForAsync(new() { State = WaitForSelectorState.Visible });
                 await _page.Keyboard.PressAsync("Escape");
-                await _page.GetByRole(AriaRole.Heading, new() { Name = "Playback" }).ClickAsync();
+                // Click outside the autocomplete to have an focus lost event for getting the value written to model
+                await _page.GetByRole(AriaRole.Heading, new() { Name = "Playback" }).ClickAsync(new() { Force = true });
                 await _page.WaitForTimeoutAsync(100);
             }
         }

AudioCuesheetEditor.Tests/AudioCuesheetEditor.Tests.csproj

@@ -22,18 +22,30 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
+    <None Update="Resources\Playlist-#36-Frames.cue">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Resources\Playlist-Bug#30.cue">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Resources\Playlist-Bug#57.cue">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Resources\Sample_Inputfile.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Resources\Textimport with Cuesheetdata.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Resources\Textimport_Bug_#233.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Resources\Textimport_Bug_213.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Resources\Traktor Export.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>

AudioCuesheetEditor.Tests/MSTestSettings.cs

@@ -0,0 +1,3 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]

AudioCuesheetEditor.Tests/Model/Entity/ValidateableTests.cs

@@ -72,7 +72,7 @@ public void ValidateTest()
             };
             Assert.AreEqual(ValidationStatus.Error, testObject.Validate().Status);
             Assert.IsNotNull(testObject.Validate().ValidationMessages);
-            Assert.IsTrue(testObject.Validate().ValidationMessages?.Count == 1);
+            Assert.AreEqual(1, testObject.Validate().ValidationMessages?.Count);
             testObject.TestProperty = "Test";
             Assert.AreEqual(ValidationStatus.Success, testObject.Validate().Status);
         }

AudioCuesheetEditor.Tests/Model/Entity/ValidationResultTests.cs

@@ -32,7 +32,7 @@ public void Create_NoValidation_ReturnsExpectedResult()
 
             // Assert
             Assert.AreEqual(ValidationStatus.NoValidation, validationResult.Status);
-            Assert.AreEqual(0, validationResult.ValidationMessages.Count);
+            Assert.IsEmpty(validationResult.ValidationMessages);
         }
 
         [TestMethod]
@@ -43,7 +43,7 @@ public void Create_Success_ReturnsExpectedResult()
 
             // Assert
             Assert.AreEqual(ValidationStatus.Success, validationResult.Status);
-            Assert.AreEqual(0, validationResult.ValidationMessages.Count);
+            Assert.IsEmpty(validationResult.ValidationMessages);
         }
 
         [TestMethod]
@@ -54,7 +54,7 @@ public void Create_Error_ReturnsExpectedResult()
 
             // Assert
             Assert.AreEqual(ValidationStatus.Error, validationResult.Status);
-            Assert.AreEqual(0, validationResult.ValidationMessages.Count);
+            Assert.IsEmpty(validationResult.ValidationMessages);
         }
 
         [TestMethod]
@@ -93,7 +93,7 @@ public void Default_Status_IsNoValidation()
 
             // Assert
             Assert.AreEqual(ValidationStatus.NoValidation, validationResult.Status);
-            Assert.AreEqual(0, validationResult.ValidationMessages.Count);
+            Assert.IsEmpty(validationResult.ValidationMessages);
         }
 
         [TestMethod]

AudioCuesheetEditor.Tests/Model/IO/Audio/AudiofileTests.cs

@@ -29,15 +29,15 @@ public void AudioFileTest()
             Assert.IsNull(audioFile.ContentStream);
             Assert.IsFalse(audioFile.IsContentStreamLoaded);
             Assert.IsNotNull(audioFile.Name);
-            Assert.AreEqual(audioFile.AudioFileType, "MP3");
+            Assert.AreEqual("MP3", audioFile.AudioFileType);
             audioFile = new Audiofile("Test");
             Assert.AreEqual(audioFile.AudioFileType, string.Empty);
             Assert.IsNotNull(audioFile.Name);
             var codec = Audiofile.AudioCodecs.Single(x => x.FileExtension == ".ogg");
             audioFile = new Audiofile("test", "TestobjectURL", codec);
             Assert.IsNotNull(audioFile.Name);
             Assert.AreEqual("test.ogg", audioFile.Name);
-            Assert.AreEqual(audioFile.AudioFileType, "OGG");
+            Assert.AreEqual("OGG", audioFile.AudioFileType);
             Assert.IsNotNull(audioFile.ObjectURL);
             Assert.IsTrue(audioFile.PlaybackPossible);
             codec = Audiofile.AudioCodecs.Single(x => x.FileExtension == ".mp3");

AudioCuesheetEditor.Tests/Model/IO/Export/CuesheetSectionTests.cs

@@ -1,9 +1,10 @@
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.Entity;
+using AudioCuesheetEditor.Model.IO.Export;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 
-namespace AudioCuesheetEditor.Model.IO.Export.Tests
+namespace AudioCuesheetEditor.Tests.Model.IO.Export
 {
     [TestClass()]
     public class CuesheetSectionTests

AudioCuesheetEditor.Tests/Model/IO/Import/ImportprofileTests.cs

@@ -37,7 +37,7 @@ public void Validate_WithoutPlaceholder_ReturnsInvalid()
             var result = importprofile.Validate();
             // Assert
             Assert.AreEqual(ValidationStatus.Error, result.Status);
-            Assert.AreEqual(2, result.ValidationMessages.Count);
+            Assert.HasCount(2, result.ValidationMessages);
             Assert.AreEqual("{0} contains no placeholder!", result.ValidationMessages.First().Message);
             Assert.AreEqual(nameof(Importprofile.SchemeCuesheet), result.ValidationMessages.First().Parameter?.First().ToString());
             Assert.AreEqual("{0} contains no placeholder!", result.ValidationMessages.Last().Message);

AudioCuesheetEditor.Tests/Model/IO/ProjectfileTests.cs

@@ -142,7 +142,7 @@ public void ImportFile_ValidProjectfile_ShouldImportFile()
             Assert.AreEqual("AudioFile.mp3", cuesheet.Audiofile?.Name);
             Assert.AreEqual("A123", cuesheet.Cataloguenumber);
             Assert.AreEqual(2, cuesheet.Validate(nameof(Cuesheet.Cataloguenumber)).ValidationMessages?.Count);
-            Assert.AreEqual(10, cuesheet.Tracks.Count);
+            Assert.HasCount(10, cuesheet.Tracks);
             Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.DCP));
             Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.FourCH));
             Assert.AreEqual("Artist 10", cuesheet.Tracks.Last().Artist);
@@ -167,15 +167,15 @@ public void ImportFile_ValidProjectfileWithSections_ShouldImportFile()
             Assert.AreEqual("AudioFile.mp3", cuesheet.Audiofile?.Name);
             Assert.AreEqual("A123", cuesheet.Cataloguenumber);
             Assert.AreEqual(2, cuesheet.Validate(nameof(Cuesheet.Cataloguenumber)).ValidationMessages?.Count);
-            Assert.AreEqual(10, cuesheet.Tracks.Count);
+            Assert.HasCount(10, cuesheet.Tracks);
             Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.DCP));
             Assert.IsTrue(cuesheet.Tracks.ElementAt(3).Flags.Contains(Flag.FourCH));
             Assert.AreEqual("Artist 10", cuesheet.Tracks.Last().Artist);
             Assert.AreEqual(new TimeSpan(0, 55, 55), cuesheet.Tracks.Last().End);
             Assert.IsTrue(ReferenceEquals(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1))));
             Assert.AreEqual(cuesheet.Tracks.First(), cuesheet.GetPreviousLinkedTrack(cuesheet.Tracks.ElementAt(1)));
             Assert.AreEqual((uint)10, cuesheet.Tracks.Last().Position);
-            Assert.AreEqual(2, cuesheet.Sections.Count);
+            Assert.HasCount(2, cuesheet.Sections);
             Assert.AreEqual(new TimeSpan(0, 30, 0), cuesheet.Sections.First().Begin);
             Assert.AreEqual(new TimeSpan(1, 0, 0), cuesheet.Sections.Last().Begin);
         }

AudioCuesheetEditor.Tests/Model/Options/ExportOptionsTest.cs

@@ -18,20 +18,21 @@
 using System.Linq;
 using System.Text.Json;
 
-namespace AudioCuesheetEditorTests.Model.Options
+namespace AudioCuesheetEditor.Tests.Model.Options
 {
     [TestClass()]
     public class ExportOptionsTest
     {
+        private readonly JsonSerializerOptions serializerOptions = new()
+        {
+            DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull
+        };
+
         [TestMethod()]
         public void SerializationTest()
         {
-            var options = new ExportOptions();
-            var serializerOptions = new JsonSerializerOptions
-            {
-                DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull
-            };
-            var optionsJson = JsonSerializer.Serialize<object>(options, serializerOptions);
+            var exportOptions = new ExportOptions();
+            var optionsJson = JsonSerializer.Serialize<object>(exportOptions, serializerOptions);
             Assert.IsNotNull(optionsJson);
         }
 
@@ -50,7 +51,7 @@ public void DeserializeBackwardCompabilityTest()
             var optionsJson = "{\"ExportProfiles\":[{\"Name\":\"YouTube\",\"SchemeHead\":\"%Cuesheet.Artist% - %Cuesheet.Title%\",\"SchemeTracks\":\"%Track.Artist% - %Track.Title% %Track.Begin%\",\"SchemeFooter\":\"\",\"Filename\":\"YouTube.txt\"},{\"Name\":\"Mixcloud\",\"SchemeHead\":\"\",\"SchemeTracks\":\"%Track.Artist% - %Track.Title% %Track.Begin%\",\"SchemeFooter\":\"\",\"Filename\":\"Mixcloud.txt\"},{\"Name\":\"CSV Export\",\"SchemeHead\":\"%Cuesheet.Artist%;%Cuesheet.Title%;\",\"SchemeTracks\":\"%Track.Position%;%Track.Artist%;%Track.Title%;%Track.Begin%;%Track.End%;%Track.Length%\",\"SchemeFooter\":\"Exported at %DateTime% using AudioCuesheetEditor (https://neocodermatrix86.github.io/AudioCuesheetEditor/)\",\"Filename\":\"Export.csv\"},{\"Name\":\"Tracks only\",\"SchemeHead\":\"\",\"SchemeTracks\":\"%Track.Position% - %Track.Artist% - %Track.Title% - %Track.Begin% - %Track.End% - %Track.Length%\",\"SchemeFooter\":\"\",\"Filename\":\"Tracks.txt\"}]}";
             var options = JsonSerializer.Deserialize<ExportOptions>(optionsJson);
             Assert.IsNotNull(options);
-            Assert.AreEqual(4, options.ExportProfiles.Count);
+            Assert.HasCount(4, options.ExportProfiles);
         }
     }
 }