Merge pull request #360 from NeoCoderMatrix86/349-track-validation-of…

…-beginend-is-failing Track validation of beginend is failing
NeoCoderMatrix86 · Jun 4, 2024 · c031151 · c031151
2 parents 00d2fe9 + 85dd504
commit c031151
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs b/AudioCuesheetEditor/Model/AudioCuesheet/Track.cs
@@ -432,6 +432,11 @@ protected override ValidationResult Validate(string property)
                             validationMessages ??= [];
                             validationMessages.Add(new ValidationMessage("{0} must be equal or greater zero!", nameof(Begin)));
                         }
+                        if (Begin > End)
+                        {
+                            validationMessages ??= [];
+                            validationMessages.Add(new ValidationMessage("{0} should be less than or equal '{1}'!", nameof(Begin), nameof(End)));
+                        }
                     }
                     break;
                 case nameof(End):
@@ -448,6 +453,11 @@ protected override ValidationResult Validate(string property)
                             validationMessages ??= [];
                             validationMessages.Add(new ValidationMessage("{0} must be equal or greater zero!", nameof(End)));
                         }
+                        if (End < Begin)
+                        {
+                            validationMessages ??= [];
+                            validationMessages.Add(new ValidationMessage("{0} should be greater than or equal '{1}'!", nameof(End), nameof(Begin)));
+                        }
                     }
                     break;
                 case nameof(Length):

diff --git a/AudioCuesheetEditor/Model/Entity/IValidateable.cs b/AudioCuesheetEditor/Model/Entity/IValidateable.cs
@@ -65,7 +65,7 @@ public List<ValidationMessage>? ValidationMessages
             set
             {
                 validationMessages = value;
-                if ((validationMessages != null) && validationMessages.Any())
+                if ((validationMessages != null) && validationMessages.Count != 0)
                 {
                     Status = ValidationStatus.Error;
                 }

diff --git a/AudioCuesheetEditorTests/Model/AudioCuesheet/TrackTests.cs b/AudioCuesheetEditorTests/Model/AudioCuesheet/TrackTests.cs
@@ -176,7 +176,7 @@ public void CopyValuesTest()
             Assert.AreEqual(sourceTrack.End, destinyTrack.End);
             Assert.AreEqual(sourceTrack.PreGap, destinyTrack.PreGap);
             Assert.AreEqual(sourceTrack.PostGap, destinyTrack.PostGap);
-            var destinationTracks = new List<Track>() { new Track(), new Track(), new Track() };
+            var destinationTracks = new List<Track>() { new(), new(), new() };
             destinationTracks.ForEach(x => x.CopyValues(sourceTrack, useInternalSetters: Track.AllPropertyNames));
             Assert.IsTrue(destinationTracks.All(x => x.IsLinkedToPreviousTrack == sourceTrack.IsLinkedToPreviousTrack));
             Assert.IsTrue(destinationTracks.All(x => x.Cuesheet == sourceTrack.Cuesheet));
@@ -223,5 +223,35 @@ public void SetCuesheetTest()
             track.Cuesheet = null;
             Assert.IsNull(track.Cuesheet);
         }
+
+        [TestMethod()]
+        public void Validate_InvalidEnd_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var track = new Track
+            {
+                Begin = new TimeSpan(0, 2, 32),
+                End = new TimeSpan(0, 1, 15)
+            };
+            // Act
+            var endValidationResult = track.Validate(x => x.End);
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
+        }
+
+        [TestMethod()]
+        public void Validate_InvalidBegin_ReturnsValidationStatusError()
+        {
+            // Arrange
+            var track = new Track
+            {
+                Begin = new TimeSpan(0, 4, 53),
+                End = new TimeSpan(0, 3, 15)
+            };
+            // Act
+            var endValidationResult = track.Validate(x => x.Begin);
+            // Assert
+            Assert.AreEqual(ValidationStatus.Error, endValidationResult.Status);
+        }
     }
 }