Skip to content

Commit d771b8a

Browse files
authored
Merge pull request #28574 from juli27/convertMidiExportTests
iex/midi/tests: Convert MIDI export tests
2 parents c5d39e1 + a625057 commit d771b8a

File tree

6 files changed

+327
-736
lines changed

6 files changed

+327
-736
lines changed

src/importexport/midi/internal/midiimport/importmidi_instrument.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ constexpr std::array GM1_SOUND_DATA {
112112
GM1ProgramData{ GM1Program::StringEnsemble2, "strings"sv },
113113
GM1ProgramData{ GM1Program::SynthStrings1, "string-synthesizer"sv },
114114
GM1ProgramData{ GM1Program::SynthStrings2, "string-synthesizer"sv },
115-
GM1ProgramData{ GM1Program::ChoirAahs, "soprano"sv },
116-
GM1ProgramData{ GM1Program::VoiceOohs, "soprano"sv },
115+
GM1ProgramData{ GM1Program::ChoirAahs, "voice"sv },
116+
GM1ProgramData{ GM1Program::VoiceOohs, "voice"sv },
117117
GM1ProgramData{ GM1Program::SynthVoice, "voice"sv },
118118
GM1ProgramData{ GM1Program::OrchestraHit, "brass-synthesizer"sv },
119119
GM1ProgramData{ GM1Program::Trumpet, "trumpet"sv },

src/importexport/midi/tests/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ set(MODULE_TEST_SRC
2727
${PROJECT_SOURCE_DIR}/src/engraving/tests/utils/scorecomp.h
2828

2929
${CMAKE_CURRENT_LIST_DIR}/environment.cpp
30-
#${CMAKE_CURRENT_LIST_DIR}/testbase.cpp
31-
#${CMAKE_CURRENT_LIST_DIR}/testbase.h
3230
${CMAKE_CURRENT_LIST_DIR}/midiimport_tests.cpp
33-
#${CMAKE_CURRENT_LIST_DIR}/midiexport_tests.cpp doesn't compile and needs actualization
31+
${CMAKE_CURRENT_LIST_DIR}/midiexport_tests.cpp
3432
)
3533

3634
set(MODULE_TEST_LINK

src/importexport/midi/tests/inner_func_decl.h

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)