From cfffdbea26f4552d107d5a726b571c3c3182a783 Mon Sep 17 00:00:00 2001 From: Francois Best Date: Wed, 2 Nov 2016 09:02:00 +0100 Subject: [PATCH] Fix shadowing warnings. --- .../unit-tests/tests/unit-tests_MidiInput.cpp | 20 +++++----- .../tests/unit-tests_MidiOutput.cpp | 37 +++++++++---------- test/unit-tests/tests/unit-tests_MidiThru.cpp | 11 +++--- 3 files changed, 32 insertions(+), 36 deletions(-) diff --git a/test/unit-tests/tests/unit-tests_MidiInput.cpp b/test/unit-tests/tests/unit-tests_MidiInput.cpp index 725eae8..38d5c9f 100644 --- a/test/unit-tests/tests/unit-tests_MidiInput.cpp +++ b/test/unit-tests/tests/unit-tests_MidiInput.cpp @@ -165,10 +165,10 @@ TEST(MidiInput, inputDisabled) TEST(MidiInput, multiByteParsing) { typedef VariableSettings Settings; - typedef midi::MidiInterface MidiInterface; + typedef midi::MidiInterface MultiByteMidiInterface; SerialMock serial; - MidiInterface midi(serial); + MultiByteMidiInterface midi(serial); static const unsigned rxSize = 3; static const byte rxData[rxSize] = { 0x9b, 12, 34 }; midi.begin(12); @@ -486,11 +486,11 @@ TEST(MidiInput, afterTouchChannel) TEST(MidiInput, sysExWithinBufferSize) { typedef VariableSysExSettings<1024> Settings; - typedef test_mocks::SerialMock<2048> SerialMock; - typedef midi::MidiInterface MidiInterface; + typedef test_mocks::SerialMock<2048> LargerSerialMock; + typedef midi::MidiInterface LargerMidiInterface; - SerialMock serial; - MidiInterface midi(serial); + LargerSerialMock serial; + LargerMidiInterface midi(serial); // Short Frame < 256 { @@ -553,10 +553,10 @@ TEST(MidiInput, sysExWithinBufferSize) TEST(MidiInput, sysExOverBufferSize) { typedef VariableSysExSettings<8> Settings; - typedef midi::MidiInterface MidiInterface; + typedef midi::MidiInterface SmallMidiInterface; SerialMock serial; - MidiInterface midi(serial); + SmallMidiInterface midi(serial); static const unsigned frameLength = 15; static const byte frame[frameLength] = { @@ -907,10 +907,10 @@ TEST(MidiInput, strayUndefinedOneByteParsing) TEST(MidiInput, strayUndefinedMultiByteParsing) { typedef VariableSettings Settings; - typedef midi::MidiInterface MidiInterface; + typedef midi::MidiInterface MultiByteMidiInterface; SerialMock serial; - MidiInterface midi(serial); + MultiByteMidiInterface midi(serial); static const unsigned rxSize = 4; static const byte rxData[rxSize] = { diff --git a/test/unit-tests/tests/unit-tests_MidiOutput.cpp b/test/unit-tests/tests/unit-tests_MidiOutput.cpp index be8c228..a885984 100644 --- a/test/unit-tests/tests/unit-tests_MidiOutput.cpp +++ b/test/unit-tests/tests/unit-tests_MidiOutput.cpp @@ -54,10 +54,10 @@ TEST(MidiOutput, sendGenericSingle) TEST(MidiOutput, sendGenericWithRunningStatus) { typedef VariableSettings Settings; - typedef midi::MidiInterface MidiInterface; + typedef midi::MidiInterface RsMidiInterface; SerialMock serial; - MidiInterface midi(serial); + RsMidiInterface midi(serial); Buffer buffer; buffer.resize(5); @@ -74,10 +74,10 @@ TEST(MidiOutput, sendGenericWithRunningStatus) TEST(MidiOutput, sendGenericWithoutRunningStatus) { typedef VariableSettings Settings; // No running status - typedef midi::MidiInterface MidiInterface; + typedef midi::MidiInterface NoRsMidiInterface; SerialMock serial; - MidiInterface midi(serial); + NoRsMidiInterface midi(serial); Buffer buffer; buffer.resize(6); @@ -301,12 +301,11 @@ TEST(MidiOutput, sendAfterTouchPoly) TEST(MidiOutput, sendSysEx) { - typedef test_mocks::SerialMock<1024> SerialMock; - typedef midi::MidiInterface MidiInterface; + typedef test_mocks::SerialMock<1024> LargeSerialMock; + typedef midi::MidiInterface LargeMidiInterface; - - SerialMock serial; - MidiInterface midi(serial); + LargeSerialMock serial; + LargeMidiInterface midi(serial); Buffer buffer; // Short frame @@ -510,11 +509,11 @@ TEST(MidiOutput, sendRealTime) TEST(MidiOutput, RPN) { typedef VariableSettings Settings; - typedef midi::MidiInterface MidiInterface; + typedef midi::MidiInterface RsMidiInterface; SerialMock serial; - MidiInterface midi(serial); - std::vector buffer; + RsMidiInterface midi(serial); + Buffer buffer; // 14-bit Value Single Frame { @@ -626,11 +625,11 @@ TEST(MidiOutput, RPN) TEST(MidiOutput, NRPN) { typedef VariableSettings Settings; - typedef midi::MidiInterface MidiInterface; + typedef midi::MidiInterface RsMidiInterface; SerialMock serial; - MidiInterface midi(serial); - std::vector buffer; + RsMidiInterface midi(serial); + Buffer buffer; // 14-bit Value Single Frame { @@ -741,13 +740,12 @@ TEST(MidiOutput, NRPN) TEST(MidiOutput, runningStatusCancellation) { - typedef test_mocks::SerialMock<32> SerialMock; typedef VariableSettings Settings; - typedef midi::MidiInterface MidiInterface; + typedef midi::MidiInterface RsMidiInterface; SerialMock serial; - MidiInterface midi(serial); - std::vector buffer; + RsMidiInterface midi(serial); + Buffer buffer; static const unsigned sysExLength = 13; static const byte sysEx[sysExLength] = { @@ -834,7 +832,6 @@ TEST(MidiOutput, runningStatusCancellation) 0xf6, 0x90, 12, 34 })); - } END_UNNAMED_NAMESPACE diff --git a/test/unit-tests/tests/unit-tests_MidiThru.cpp b/test/unit-tests/tests/unit-tests_MidiThru.cpp index 8cca5f4..9681a52 100644 --- a/test/unit-tests/tests/unit-tests_MidiThru.cpp +++ b/test/unit-tests/tests/unit-tests_MidiThru.cpp @@ -275,12 +275,11 @@ TEST(MidiThru, differentChannelOmni) // Acts like off TEST(MidiThru, multiByteThru) { - typedef VariableSettings Settings; - typedef test_mocks::SerialMock<32> SerialMock; - typedef midi::MidiInterface MidiInterface; + typedef VariableSettings MultiByteParsing; + typedef midi::MidiInterface MultiByteMidiInterface; SerialMock serial; - MidiInterface midi(serial); + MultiByteMidiInterface midi(serial); Buffer buffer; midi.begin(MIDI_CHANNEL_OMNI); @@ -307,10 +306,10 @@ TEST(MidiThru, withTxRunningStatus) { typedef VariableSettings Settings; typedef test_mocks::SerialMock<32> SerialMock; - typedef midi::MidiInterface MidiInterface; + typedef midi::MidiInterface RsMidiInterface; SerialMock serial; - MidiInterface midi(serial); + RsMidiInterface midi(serial); Buffer buffer; midi.begin(MIDI_CHANNEL_OMNI);