Skip to content

Commit cfffdbe

Browse files
author
Francois Best
committed
Fix shadowing warnings.
1 parent 7d6cd37 commit cfffdbe

File tree

3 files changed

+32
-36
lines changed

3 files changed

+32
-36
lines changed

‎test/unit-tests/tests/unit-tests_MidiInput.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,10 @@ TEST(MidiInput, inputDisabled)
165165
TEST(MidiInput, multiByteParsing)
166166
{
167167
typedef VariableSettings<false, false> Settings;
168-
typedef midi::MidiInterface<SerialMock, Settings> MidiInterface;
168+
typedef midi::MidiInterface<SerialMock, Settings> MultiByteMidiInterface;
169169

170170
SerialMock serial;
171-
MidiInterface midi(serial);
171+
MultiByteMidiInterface midi(serial);
172172
static const unsigned rxSize = 3;
173173
static const byte rxData[rxSize] = { 0x9b, 12, 34 };
174174
midi.begin(12);
@@ -486,11 +486,11 @@ TEST(MidiInput, afterTouchChannel)
486486
TEST(MidiInput, sysExWithinBufferSize)
487487
{
488488
typedef VariableSysExSettings<1024> Settings;
489-
typedef test_mocks::SerialMock<2048> SerialMock;
490-
typedef midi::MidiInterface<SerialMock, Settings> MidiInterface;
489+
typedef test_mocks::SerialMock<2048> LargerSerialMock;
490+
typedef midi::MidiInterface<LargerSerialMock, Settings> LargerMidiInterface;
491491

492-
SerialMock serial;
493-
MidiInterface midi(serial);
492+
LargerSerialMock serial;
493+
LargerMidiInterface midi(serial);
494494

495495
// Short Frame < 256
496496
{
@@ -553,10 +553,10 @@ TEST(MidiInput, sysExWithinBufferSize)
553553
TEST(MidiInput, sysExOverBufferSize)
554554
{
555555
typedef VariableSysExSettings<8> Settings;
556-
typedef midi::MidiInterface<SerialMock, Settings> MidiInterface;
556+
typedef midi::MidiInterface<SerialMock, Settings> SmallMidiInterface;
557557

558558
SerialMock serial;
559-
MidiInterface midi(serial);
559+
SmallMidiInterface midi(serial);
560560

561561
static const unsigned frameLength = 15;
562562
static const byte frame[frameLength] = {
@@ -907,10 +907,10 @@ TEST(MidiInput, strayUndefinedOneByteParsing)
907907
TEST(MidiInput, strayUndefinedMultiByteParsing)
908908
{
909909
typedef VariableSettings<false, false> Settings;
910-
typedef midi::MidiInterface<SerialMock, Settings> MidiInterface;
910+
typedef midi::MidiInterface<SerialMock, Settings> MultiByteMidiInterface;
911911

912912
SerialMock serial;
913-
MidiInterface midi(serial);
913+
MultiByteMidiInterface midi(serial);
914914

915915
static const unsigned rxSize = 4;
916916
static const byte rxData[rxSize] = {

‎test/unit-tests/tests/unit-tests_MidiOutput.cpp‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ TEST(MidiOutput, sendGenericSingle)
5454
TEST(MidiOutput, sendGenericWithRunningStatus)
5555
{
5656
typedef VariableSettings<true, false> Settings;
57-
typedef midi::MidiInterface<SerialMock, Settings> MidiInterface;
57+
typedef midi::MidiInterface<SerialMock, Settings> RsMidiInterface;
5858

5959
SerialMock serial;
60-
MidiInterface midi(serial);
60+
RsMidiInterface midi(serial);
6161
Buffer buffer;
6262
buffer.resize(5);
6363

@@ -74,10 +74,10 @@ TEST(MidiOutput, sendGenericWithRunningStatus)
7474
TEST(MidiOutput, sendGenericWithoutRunningStatus)
7575
{
7676
typedef VariableSettings<false, true> Settings; // No running status
77-
typedef midi::MidiInterface<SerialMock, Settings> MidiInterface;
77+
typedef midi::MidiInterface<SerialMock, Settings> NoRsMidiInterface;
7878

7979
SerialMock serial;
80-
MidiInterface midi(serial);
80+
NoRsMidiInterface midi(serial);
8181
Buffer buffer;
8282
buffer.resize(6);
8383

@@ -301,12 +301,11 @@ TEST(MidiOutput, sendAfterTouchPoly)
301301

302302
TEST(MidiOutput, sendSysEx)
303303
{
304-
typedef test_mocks::SerialMock<1024> SerialMock;
305-
typedef midi::MidiInterface<SerialMock> MidiInterface;
306-
304+
typedef test_mocks::SerialMock<1024> LargeSerialMock;
305+
typedef midi::MidiInterface<LargeSerialMock> LargeMidiInterface;
307306

308-
SerialMock serial;
309-
MidiInterface midi(serial);
307+
LargeSerialMock serial;
308+
LargeMidiInterface midi(serial);
310309
Buffer buffer;
311310

312311
// Short frame
@@ -510,11 +509,11 @@ TEST(MidiOutput, sendRealTime)
510509
TEST(MidiOutput, RPN)
511510
{
512511
typedef VariableSettings<true, true> Settings;
513-
typedef midi::MidiInterface<SerialMock, Settings> MidiInterface;
512+
typedef midi::MidiInterface<SerialMock, Settings> RsMidiInterface;
514513

515514
SerialMock serial;
516-
MidiInterface midi(serial);
517-
std::vector<test_mocks::uint8> buffer;
515+
RsMidiInterface midi(serial);
516+
Buffer buffer;
518517

519518
// 14-bit Value Single Frame
520519
{
@@ -626,11 +625,11 @@ TEST(MidiOutput, RPN)
626625
TEST(MidiOutput, NRPN)
627626
{
628627
typedef VariableSettings<true, true> Settings;
629-
typedef midi::MidiInterface<SerialMock, Settings> MidiInterface;
628+
typedef midi::MidiInterface<SerialMock, Settings> RsMidiInterface;
630629

631630
SerialMock serial;
632-
MidiInterface midi(serial);
633-
std::vector<test_mocks::uint8> buffer;
631+
RsMidiInterface midi(serial);
632+
Buffer buffer;
634633

635634
// 14-bit Value Single Frame
636635
{
@@ -741,13 +740,12 @@ TEST(MidiOutput, NRPN)
741740

742741
TEST(MidiOutput, runningStatusCancellation)
743742
{
744-
typedef test_mocks::SerialMock<32> SerialMock;
745743
typedef VariableSettings<true, false> Settings;
746-
typedef midi::MidiInterface<SerialMock, Settings> MidiInterface;
744+
typedef midi::MidiInterface<SerialMock, Settings> RsMidiInterface;
747745

748746
SerialMock serial;
749-
MidiInterface midi(serial);
750-
std::vector<test_mocks::uint8> buffer;
747+
RsMidiInterface midi(serial);
748+
Buffer buffer;
751749

752750
static const unsigned sysExLength = 13;
753751
static const byte sysEx[sysExLength] = {
@@ -834,7 +832,6 @@ TEST(MidiOutput, runningStatusCancellation)
834832
0xf6,
835833
0x90, 12, 34
836834
}));
837-
838835
}
839836

840837
END_UNNAMED_NAMESPACE

‎test/unit-tests/tests/unit-tests_MidiThru.cpp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -275,12 +275,11 @@ TEST(MidiThru, differentChannelOmni) // Acts like off
275275

276276
TEST(MidiThru, multiByteThru)
277277
{
278-
typedef VariableSettings<false, false> Settings;
279-
typedef test_mocks::SerialMock<32> SerialMock;
280-
typedef midi::MidiInterface<SerialMock, Settings> MidiInterface;
278+
typedef VariableSettings<false, false> MultiByteParsing;
279+
typedef midi::MidiInterface<SerialMock, MultiByteParsing> MultiByteMidiInterface;
281280

282281
SerialMock serial;
283-
MidiInterface midi(serial);
282+
MultiByteMidiInterface midi(serial);
284283
Buffer buffer;
285284

286285
midi.begin(MIDI_CHANNEL_OMNI);
@@ -307,10 +306,10 @@ TEST(MidiThru, withTxRunningStatus)
307306
{
308307
typedef VariableSettings<true, true> Settings;
309308
typedef test_mocks::SerialMock<32> SerialMock;
310-
typedef midi::MidiInterface<SerialMock, Settings> MidiInterface;
309+
typedef midi::MidiInterface<SerialMock, Settings> RsMidiInterface;
311310

312311
SerialMock serial;
313-
MidiInterface midi(serial);
312+
RsMidiInterface midi(serial);
314313
Buffer buffer;
315314

316315
midi.begin(MIDI_CHANNEL_OMNI);

0 commit comments

Comments
 (0)