Merge pull request #405 from NeoCoderMatrix86/development

Deploy V8.0

AudioCuesheetEditorTests/AudioCuesheetEditorTests.csproj → AudioCuesheetEditor.Tests/AudioCuesheetEditor.Tests.csproj

@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.4" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.4" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

AudioCuesheetEditorTests/Extensions/SessionStateContainerTests.cs → AudioCuesheetEditor.Tests/Extensions/SessionStateContainerTests.cs

@@ -15,7 +15,7 @@
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.UI;
-using AudioCuesheetEditorTests.Utility;
+using AudioCuesheetEditor.Tests.Utility;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace AudioCuesheetEditor.Extensions.Tests

AudioCuesheetEditorTests/Model/AudioCuesheet/CataloguenumberTests.cs → AudioCuesheetEditor.Tests/Model/AudioCuesheet/CataloguenumberTests.cs

@@ -13,16 +13,11 @@
 //You should have received a copy of the GNU General Public License
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using AudioCuesheetEditor.Model.AudioCuesheet;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using AudioCuesheetEditorTests.Utility;
+using AudioCuesheetEditor.Model.Entity;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace AudioCuesheetEditor.Model.AudioCuesheet.Tests
+namespace AudioCuesheetEditor.Tests.Model.AudioCuesheet
 {
     [TestClass()]
     public class CataloguenumberTests
@@ -31,13 +26,13 @@ public class CataloguenumberTests
         public void CatalogueNumberTest()
         {
             var catalogueNumber = new Cataloguenumber();
-            Assert.AreEqual(Entity.ValidationStatus.NoValidation, catalogueNumber.Validate().Status);
+            Assert.AreEqual(ValidationStatus.NoValidation, catalogueNumber.Validate().Status);
             catalogueNumber.Value = "Testvalue";
-            Assert.AreEqual(Entity.ValidationStatus.Error, catalogueNumber.Validate().Status);
+            Assert.AreEqual(ValidationStatus.Error, catalogueNumber.Validate().Status);
             catalogueNumber.Value = "01234567891234567890";
-            Assert.AreEqual(Entity.ValidationStatus.Error, catalogueNumber.Validate().Status);
+            Assert.AreEqual(ValidationStatus.Error, catalogueNumber.Validate().Status);
             catalogueNumber.Value = "1234567890123";
-            Assert.AreEqual(Entity.ValidationStatus.Success, catalogueNumber.Validate().Status);
+            Assert.AreEqual(ValidationStatus.Success, catalogueNumber.Validate().Status);
         }
     }
 }

AudioCuesheetEditorTests/Model/AudioCuesheet/CuesheetTests.cs → AudioCuesheetEditor.Tests/Model/AudioCuesheet/CuesheetTests.cs

@@ -15,23 +15,25 @@
 //<http: //www.gnu.org/licenses />.
 using AudioCuesheetEditor.Data.Options;
 using AudioCuesheetEditor.Extensions;
+using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.Entity;
 using AudioCuesheetEditor.Model.IO.Audio;
 using AudioCuesheetEditor.Model.IO.Import;
 using AudioCuesheetEditor.Model.Options;
 using AudioCuesheetEditor.Model.UI;
 using AudioCuesheetEditor.Services.IO;
-using AudioCuesheetEditorTests.Properties;
-using AudioCuesheetEditorTests.Utility;
+using AudioCuesheetEditor.Tests.Properties;
+using AudioCuesheetEditor.Tests.Utility;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
-namespace AudioCuesheetEditor.Model.AudioCuesheet.Tests
+namespace AudioCuesheetEditor.Tests.Model.AudioCuesheet
 {
     [TestClass()]
     public class CuesheetTests
@@ -41,15 +43,12 @@ public void AddTrackTest()
         {
             var testHelper = new TestHelper();
             var cuesheet = new Cuesheet();
-            var trackAddedFired = false;
-            cuesheet.TrackAdded += delegate
-            {
-                trackAddedFired = true;
-            };
+            AutoResetEvent tracksAddedEvent = new(false);
+            cuesheet.TracksAdded += (object? sender, TracksAddedRemovedEventArgs args) => tracksAddedEvent.Set();
             Assert.AreEqual(cuesheet.Tracks.Count, 0);
             cuesheet.AddTrack(new Track(), testHelper.ApplicationOptions);
             Assert.AreEqual(cuesheet.Tracks.Count, 1);
-            Assert.IsTrue(trackAddedFired);
+            Assert.IsTrue(tracksAddedEvent.WaitOne(1000));
         }
 
         [TestMethod()]
@@ -221,7 +220,7 @@ public void MoveAndDeleteTrackTest()
         public async Task ImportTestAsync()
         {
             // Arrange
-            var fileContent = new List<String>
+            var fileContent = new List<string>
             {
                 "CuesheetArtist - CuesheetTitle				c:\\tmp\\Testfile.mp3",
                 "Sample Artist 1 - Sample Title 1				00:05:00",
@@ -271,7 +270,7 @@ public async Task ImportTestCalculateEndCorrectlyAsync()
             // Arrange
             var textImportMemoryStream = new MemoryStream(Resources.Textimport_Bug_54);
             using var reader = new StreamReader(textImportMemoryStream);
-            List<String?> lines = [];
+            List<string?> lines = [];
             while (reader.EndOfStream == false)
             {
                 lines.Add(reader.ReadLine());
@@ -320,11 +319,11 @@ public void RecordTest()
             cuesheet = new Cuesheet();
             cuesheet.StartRecording();
             track = new Track();
-            testHelper.RecordOptions.RecordTimeSensitivity = Options.TimeSensitivityMode.Seconds;
+            testHelper.RecordOptions.RecordTimeSensitivity = TimeSensitivityMode.Seconds;
             cuesheet.AddTrack(track, testHelper.ApplicationOptions, testHelper.RecordOptions);
             Assert.AreEqual(TimeSpan.Zero, track.Begin);
             Assert.IsNull(track.End);
-            System.Threading.Thread.Sleep(3000);
+            Thread.Sleep(3000);
             track2 = new Track();
             cuesheet.AddTrack(track2, testHelper.ApplicationOptions, testHelper.RecordOptions);
             Assert.IsNotNull(track.End);
@@ -427,7 +426,9 @@ public void RemoveTrackTest()
         {
             var testHelper = new TestHelper();
             testHelper.ApplicationOptions.LinkTracksWithPreviousOne = true;
+            AutoResetEvent tracksRemovedEvent = new(false);
             var cuesheet = new Cuesheet();
+            cuesheet.TracksRemoved += (sender, trackAddRemoveEventArgs) => tracksRemovedEvent.Set();
             var track1 = new Track() { Artist = "1", Title = "1" };
             var track2 = new Track() { Artist = "2", Title = "2" };
             var track3 = new Track() { Artist = "3", Title = "3" };
@@ -445,12 +446,14 @@ public void RemoveTrackTest()
             track5.End = new TimeSpan(0, 25, 0);
             Assert.AreEqual(5, cuesheet.Tracks.Count);
             cuesheet.RemoveTrack(track2);
+            Assert.AreEqual(true, tracksRemovedEvent.WaitOne(1000));
             Assert.AreEqual((uint)2, track3.Position);
             Assert.AreEqual((uint)3, track4.Position);
             Assert.AreEqual((uint)4, track5.Position);
             testHelper = new TestHelper();
             testHelper.ApplicationOptions.LinkTracksWithPreviousOne = true;
             cuesheet = new Cuesheet();
+            cuesheet.TracksRemoved += (sender, trackAddRemoveEventArgs) => tracksRemovedEvent.Set();
             track1 = new Track
             {
                 Artist = "Track 1",
@@ -487,6 +490,7 @@ public void RemoveTrackTest()
             cuesheet.AddTrack(track5, testHelper.ApplicationOptions);
             var list = new List<Track>() { track2, track4 };
             cuesheet.RemoveTracks(list.AsReadOnly());
+            Assert.AreEqual(true, tracksRemovedEvent.WaitOne(1000));
             Assert.AreEqual(3, cuesheet.Tracks.Count);
             Assert.AreEqual(new TimeSpan(0, 5, 0), track3.Begin);
             Assert.AreEqual(new TimeSpan(0, 15, 0), track5.Begin);
@@ -634,5 +638,35 @@ public void ValidateTest()
             cuesheet.Title = "Testtitle";
             Assert.AreEqual(ValidationStatus.Success, cuesheet.Validate(x => x.Title).Status);
         }
+
+        [TestMethod()]
+        public void IsLinkedToPreviousTrack_ChangedLastTrackBegin_SetsTrackProperties()
+        {
+            //Arrange
+            var applicationOptions = new ApplicationOptions()
+            {
+                LinkTracksWithPreviousOne = false
+            };
+            var cuesheet = new Cuesheet();
+            var track1 = new Track()
+            {
+                Artist = "Track1 Artist",
+                Title = "Track1 Title"
+            };
+            var track2 = new Track()
+            {
+                Artist = "Track2 Artist",
+                Title = "Track2 Title",
+                End = new TimeSpan(0, 9, 12)
+            };
+            cuesheet.AddTrack(track1, applicationOptions);
+            cuesheet.AddTrack(track2, applicationOptions);
+            track2.Begin = new TimeSpan(0, 4, 23);
+            //Act
+            track2.IsLinkedToPreviousTrack = true;
+            //Assert
+            Assert.AreEqual((uint)2, track2.Position);
+            Assert.AreEqual(track2.Begin, track1.End);
+        }
     }
 }

AudioCuesheetEditorTests/Model/AudioCuesheet/TrackTests.cs → AudioCuesheetEditor.Tests/Model/AudioCuesheet/TrackTests.cs

@@ -13,14 +13,15 @@
 //You should have received a copy of the GNU General Public License
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
+using AudioCuesheetEditor.Model.AudioCuesheet;
 using AudioCuesheetEditor.Model.Entity;
-using AudioCuesheetEditorTests.Utility;
+using AudioCuesheetEditor.Tests.Utility;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace AudioCuesheetEditor.Model.AudioCuesheet.Tests
+namespace AudioCuesheetEditor.Tests.Model.AudioCuesheet
 {
     [TestClass()]
     public class TrackTests
@@ -84,7 +85,7 @@ public void LinkTrackTest()
                 Position = 2
             };
             Assert.IsFalse(track2.IsLinkedToPreviousTrack);
-            Boolean eventFired = false;
+            bool eventFired = false;
             track2.IsLinkedToPreviousTrackChanged += delegate
             {
                 eventFired = true;

AudioCuesheetEditorTests/Model/Entity/ValidateableTests.cs → AudioCuesheetEditor.Tests/Model/Entity/ValidateableTests.cs

@@ -13,19 +13,18 @@
 //You should have received a copy of the GNU General Public License
 //along with Foobar.  If not, see
 //<http: //www.gnu.org/licenses />.
-using AudioCuesheetEditorTests.Utility;
+using AudioCuesheetEditor.Model.Entity;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
 using System.Collections.Generic;
 
-namespace AudioCuesheetEditor.Model.Entity.Tests
+namespace AudioCuesheetEditor.Tests.Model.Entity
 {
     public class ValidateableTestClass : Validateable<ValidateableTestClass>
     {
-        private String? testProperty;
+        private string? testProperty;
         private int? testProperty2;
 
-        public String? TestProperty 
+        public string? TestProperty
         {
             get => testProperty;
             set
@@ -34,7 +33,7 @@ public String? TestProperty
                 OnValidateablePropertyChanged();
             }
         }
-        public int? TestProperty2 
+        public int? TestProperty2
         {
             get => testProperty2;
             set
@@ -51,9 +50,9 @@ protected override ValidationResult Validate(string property)
             {
                 case nameof(TestProperty):
                     validationStatus = ValidationStatus.Success;
-                    if (String.IsNullOrEmpty(TestProperty))
+                    if (string.IsNullOrEmpty(TestProperty))
                     {
-                        validationMessages ??= new();
+                        validationMessages ??= [];
                         validationMessages.Add(new ValidationMessage("{0} has no value!", nameof(TestProperty)));
                     }
                     break;
@@ -69,7 +68,7 @@ public void ValidateTest()
         {
             var testObject = new ValidateableTestClass
             {
-                TestProperty = String.Empty
+                TestProperty = string.Empty
             };
             Assert.AreEqual(ValidationStatus.Error, testObject.Validate().Status);
             Assert.IsNotNull(testObject.Validate().ValidationMessages);