Added additional objects detection settings to ManageNotes/ManageChor…

…ds methods
melanchall · Aug 10, 2024 · 6cbb5d6 · 6cbb5d6
1 parent 3d41e0b
commit 6cbb5d6
Show file tree

Hide file tree

Showing 12 changed files with 850 additions and 114 deletions.
diff --git a/DryWetMidi.Tests/Interaction/Chords/ChordTestUtilities.cs b/DryWetMidi.Tests/Interaction/Chords/ChordTestUtilities.cs
diff --git a/DryWetMidi.Tests/Interaction/Chords/ChordTests.cs b/DryWetMidi.Tests/Interaction/Chords/ChordTests.cs
@@ -867,6 +867,29 @@ public void CheckChordOffVelocity()
 
         #endregion
 
+        #region GetMusicTheoryChord
+
+        [Test]
+        public void GetMusicTheoryChord()
+        {
+            var chord = new Chord(
+                new Note(DryWetMidi.MusicTheory.NoteName.C, 2),
+                new Note(DryWetMidi.MusicTheory.NoteName.A, 1),
+                new Note(DryWetMidi.MusicTheory.NoteName.DSharp, 2));
+
+            Assert.AreEqual(
+                new DryWetMidi.MusicTheory.Chord(new[]
+                {
+                    DryWetMidi.MusicTheory.NoteName.A,
+                    DryWetMidi.MusicTheory.NoteName.C,
+                    DryWetMidi.MusicTheory.NoteName.DSharp
+                }),
+                chord.GetMusicTheoryChord(),
+                "Chord is invalid.");
+        }
+
+        #endregion
+
         #endregion
 
         #region Private methods

diff --git a/DryWetMidi.Tests/Interaction/Chords/ChordsManagingUtilitiesTests.Common.cs b/DryWetMidi.Tests/Interaction/Chords/ChordsManagingUtilitiesTests.Common.cs
@@ -94,11 +94,16 @@ public override bool Equals(object obj)
 
         #region Constants
 
-        private static readonly ChordMethods ChordMethods = new ChordMethods();
+        private static readonly Func<TimedEventData, CustomTimedEvent> CustomTimedEventConstructor =
+            data => new CustomTimedEvent(
+                data.Event,
+                data.Time,
+                data.EventsCollectionIndex,
+                data.EventIndex);
 
         private static readonly TimedEventDetectionSettings CustomEventSettings = new TimedEventDetectionSettings
         {
-            Constructor = data => new CustomTimedEvent(data.Event, data.Time, data.EventsCollectionIndex, data.EventIndex)
+            Constructor = CustomTimedEventConstructor
         };
 
         private static readonly Func<NoteData, Note> CustomNoteConstructor =