Improve the tests again

celtera · Dec 13, 2024 · 4b1ff74 · 4b1ff74
1 parent d0346b1
commit 4b1ff74
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 20 deletions.
diff --git a/examples/Advanced/Patternal/Patternal.hpp b/examples/Advanced/Patternal/Patternal.hpp
@@ -56,16 +56,20 @@ struct Processor
         auto quants = tk.get_quantification_date(4. / pat.size());
         for(auto [pos, q] : quants)
         {
+          // FIXME: The position returned by get_quantification_date is a negative timestamp.
           if(pos < tk.frames)
           {
             auto qq = std::abs(q % std::ssize(pat));
             if(uint8_t vel = pat[qq]; vel > 0)
             {
               halp::midi_msg m;
+              // Note on:
               m.bytes = {144, (uint8_t)note, vel};
               m.timestamp = pos;
               outputs.midi.midi_messages.push_back(m);
 
+              // FIXME: The note off should not be output right away.
+              // Note off:
               m.bytes = {128, (uint8_t)note, 0};
               m.timestamp = pos;
               outputs.midi.midi_messages.push_back(m);

diff --git a/include/halp/midi.hpp b/include/halp/midi.hpp
@@ -28,7 +28,7 @@ struct midi_msg
 
 std::ostream& operator<<(std::ostream &o, const midi_msg& message)
 {
-  return o << "midi_msg{:bytes=" << fmt::format("{}", message.bytes) << "}" << std::endl;
+  return o << "midi_msg{:bytes=" << fmt::format("{}", message.bytes) <<", :timestamp=" << message.timestamp << "}" << std::endl;
 }
 
 struct midi_note_msg
@@ -43,7 +43,7 @@ struct midi_note_msg
 
 std::ostream& operator<<(std::ostream &o, const midi_note_msg& message)
 {
-    return o << "midi_note_msg{:bytes=" << fmt::format("{}", message.bytes) <<", :timestamp=" << message.timestamp << "}" << std::endl;
+  return o << "midi_note_msg{:bytes=" << fmt::format("{}", message.bytes) <<", :timestamp=" << message.timestamp << "}" << std::endl;
 }
 
 template <static_string lit, typename MessageType = midi_msg>

diff --git a/tests/objects/patternal.cpp b/tests/objects/patternal.cpp
@@ -21,13 +21,14 @@ static const uint8_t velocityFull = 127;
 /**
  * Create a MIDI note message.
  */
-void makeNote(midi_msg& ret, uint8_t note, uint8_t velocity) {
+void makeNote(midi_msg& ret, uint8_t note, uint8_t velocity, int64_t timestamp) {
   bool isNoteOn = velocity > 0;
   if (isNoteOn) {
     ret.bytes = { messageNoteOn, note, velocity};
   } else {
     ret.bytes = { messageNoteOff, note, velocity};
   }
+  ret.timestamp = timestamp;
 }
 
 // Tests for the Patternal object
@@ -57,8 +58,8 @@ TEST_CASE("Compare two MIDI notes", "[advanced][patternal]")
   // Test that comparing two notes works:
   midi_msg simple1;
   midi_msg simple2;
-  makeNote(simple1, 60, 127);
-  makeNote(simple2, 60, 127);
+  makeNote(simple1, 60, 127, 0);
+  makeNote(simple2, 60, 127, 0);
   REQUIRE(simple1 == simple2);
 }
 
@@ -79,8 +80,11 @@ TEST_CASE("MIDI messages are output properly", "[advanced][patternal]")
   };
 
   // Check the output on each tick:
-  for (int tickIndex = 0; tickIndex < ticksPerSecond * testDuration; tickIndex++) {
-    INFO("Test tick " << tickIndex);
+  const int totalNumberOfTicks = (int) ticksPerSecond * testDuration;
+  for (int tickIndex = 0; tickIndex < totalNumberOfTicks; tickIndex++) {
+
+    INFO("tick number " << tickIndex << " / " << totalNumberOfTicks);
+    // INFO("Test tick " << tickIndex);
     tick_musical tk;
     tk.tempo = 120; // 120 BPM. One beat lasts 500 ms.
     tk.signature.num = 4;
@@ -94,27 +98,39 @@ TEST_CASE("MIDI messages are output properly", "[advanced][patternal]")
       // FIXME: why are there 4 MIDI messages and not 3?
       REQUIRE(patternalProcessor.outputs.midi.midi_messages.size() == 4);
       // Hi-hat note:
-      midi_msg expectedNoteHiHat;
-      makeNote(expectedNoteHiHat, noteHiHat, velocityFull);
-      // TODO: Re-enable this check that fails:
-      // REQUIRE(patternalProcessor.outputs.midi.midi_messages[0] == expectedNoteHiHat);
-      // Snare note:
+      midi_msg expectedNote0;
+      makeNote(expectedNote0, noteHiHat, velocityFull, -2147483648); // FIXME: Why this timestamp?
+      REQUIRE(patternalProcessor.outputs.midi.midi_messages[0] == expectedNote0);
+      // Another hi-hat note?
       midi_msg expectedNote1;
-      makeNote(expectedNote1, 42, velocityZero); // FIXME: wrong data
-      // TODO: Re-enable this check that fails:
-      // REQUIRE(patternalProcessor.outputs.midi.midi_messages[1] == expectedNote1);
+      makeNote(expectedNote1, noteHiHat, velocityZero, -2147483648);
+      REQUIRE(patternalProcessor.outputs.midi.midi_messages[1] == expectedNote1);
       // Bass drum note:
-      midi_msg expectedNoteBassDrum;
-      makeNote(expectedNoteBassDrum, noteBassDrum, velocityFull);
-      // TODO: Re-enable this check that fails:
-      // REQUIRE(patternalProcessor.outputs.midi.midi_messages[2] == expectedNoteBassDrum);
+      midi_msg expectedNote2;
+      makeNote(expectedNote2, noteBassDrum, velocityFull, -2147483648);
+      REQUIRE(patternalProcessor.outputs.midi.midi_messages[2] == expectedNote2);
+
+      // Another bass drum note:
+      // FIXME: Why a bass drum note with velocity 0?
+      midi_msg expectedNote3;
+      makeNote(expectedNote3, noteBassDrum, velocityZero, -2147483648);
+      REQUIRE(patternalProcessor.outputs.midi.midi_messages[3] == expectedNote3);
+
+      // There is not snare note to output, since it's off, for now.
+      // FIXME: The note off message is output right away?
+      // How long should the notes last?
+      // TODO: Make the note last until the next beat.
     }
 
     // Test the 2nd tick:
     else if (tickIndex == 1) {
       // There should be no MIDI messages in the output on this tick.
       REQUIRE(patternalProcessor.outputs.midi.midi_messages.size() == 0);
-      // REQUIRE(patternalProcessor.outputs.midi.midi_messages.size() == 1);
+    }
+
+    else {
+      // INFO("tick number " << tickIndex << " out of " << totalNumberOfTicks);
+      REQUIRE(patternalProcessor.outputs.midi.midi_messages.size() == 0);
     }
 
     // TODO: check the other ticks