From f43935b5c873676a632b23cbfcef45a4431b233d Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Sun, 8 Aug 2021 10:34:54 +0200
Subject: Add support for a single midi note that plays multiple instruments.

---
 test/midimapparsertest.cc | 44 ++++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

(limited to 'test/midimapparsertest.cc')

diff --git a/test/midimapparsertest.cc b/test/midimapparsertest.cc
index eb4d6d5..3e77c44 100644
--- a/test/midimapparsertest.cc
+++ b/test/midimapparsertest.cc
@@ -36,8 +36,8 @@ class MidimapParserTest
 public:
 	MidimapParserTest()
 	{
-		uUNIT_TEST(MidimapParserTest::test);
-		uUNIT_TEST(MidimapParserTest::invalid);
+		uTEST(MidimapParserTest::test);
+		uTEST(MidimapParserTest::invalid);
 	}
 
 	void test()
@@ -49,23 +49,35 @@ public:
 			"	<map note=\"60\" instr=\"Crash_left_whisker\"/>\n" \
 			"	<map note=\"55\" instr=\"Crash_right_tip\"/>\n" \
 			"	<map note=\"62\" instr=\"Crash_right_whisker\"/>\n" \
+			"	<map note=\"62\" instr=\"Hihat_closed\"/>\n" \
 			"	<map note=\"56\" instr=\"Hihat_closed\"/>\n" \
 			"</midimap>");
 
 		MidiMapParser parser;
-		uUNIT_ASSERT(parser.parseFile(scoped_file.filename()));
-
-		uUNIT_ASSERT(parser.midimap.find(54) != parser.midimap.end());
-		uUNIT_ASSERT(parser.midimap.find(60) != parser.midimap.end());
-		uUNIT_ASSERT(parser.midimap.find(55) != parser.midimap.end());
-		uUNIT_ASSERT(parser.midimap.find(62) != parser.midimap.end());
-		uUNIT_ASSERT(parser.midimap.find(56) != parser.midimap.end());
-
-		uUNIT_ASSERT_EQUAL(std::string("Crash_left_tip"), parser.midimap[54]);
-		uUNIT_ASSERT_EQUAL(std::string("Crash_left_whisker"), parser.midimap[60]);
-		uUNIT_ASSERT_EQUAL(std::string("Crash_right_tip"), parser.midimap[55]);
-		uUNIT_ASSERT_EQUAL(std::string("Crash_right_whisker"), parser.midimap[62]);
-		uUNIT_ASSERT_EQUAL(std::string("Hihat_closed"), parser.midimap[56]);
+		uASSERT(parser.parseFile(scoped_file.filename()));
+
+		const auto& midimap = parser.midimap;
+		uASSERT_EQUAL(6u, midimap.size());
+
+		uASSERT_EQUAL(54, midimap[0].note_id);
+		uASSERT_EQUAL(std::string("Crash_left_tip"), midimap[0].instrument_name);
+
+		uASSERT_EQUAL(60, midimap[1].note_id);
+		uASSERT_EQUAL(std::string("Crash_left_whisker"), midimap[1].instrument_name);
+
+		uASSERT_EQUAL(55, midimap[2].note_id);
+		uASSERT_EQUAL(std::string("Crash_right_tip"), midimap[2].instrument_name);
+
+		// These next two note numbers are intentionally the same and trigger two
+		// different instruments:
+		uASSERT_EQUAL(62, midimap[3].note_id);
+		uASSERT_EQUAL(std::string("Crash_right_whisker"), midimap[3].instrument_name);
+
+		uASSERT_EQUAL(62, midimap[4].note_id);
+		uASSERT_EQUAL(std::string("Hihat_closed"), midimap[4].instrument_name);
+
+		uASSERT_EQUAL(56, midimap[5].note_id);
+		uASSERT_EQUAL(std::string("Hihat_closed"), midimap[5].instrument_name);
 	}
 
 	void invalid()
@@ -81,7 +93,7 @@ public:
 			"</midimap>");
 
 		MidiMapParser parser;
-		uUNIT_ASSERT(!parser.parseFile(scoped_file.filename()));
+		uASSERT(!parser.parseFile(scoped_file.filename()));
 	}
 };
 
-- 
cgit v1.2.3