diff --git a/test/unit-tests/tests/unit-tests_MidiInput.cpp b/test/unit-tests/tests/unit-tests_MidiInput.cpp index 9ff755f..e418579 100644 --- a/test/unit-tests/tests/unit-tests_MidiInput.cpp +++ b/test/unit-tests/tests/unit-tests_MidiInput.cpp @@ -115,7 +115,7 @@ TEST(MidiInput, initMessage) EXPECT_EQ(midi.getChannel(), 0); EXPECT_EQ(midi.getData1(), 0); EXPECT_EQ(midi.getData2(), 0); - EXPECT_EQ(midi.getSysExArrayLength(), 0); + EXPECT_EQ(midi.getSysExArrayLength(), unsigned(0)); EXPECT_EQ(midi.check(), false); } diff --git a/test/unit-tests/tests/unit-tests_MidiMessage.cpp b/test/unit-tests/tests/unit-tests_MidiMessage.cpp index 1fb7272..d03b39d 100644 --- a/test/unit-tests/tests/unit-tests_MidiMessage.cpp +++ b/test/unit-tests/tests/unit-tests_MidiMessage.cpp @@ -24,7 +24,7 @@ TEST(MidiMessage, hasTheRightProperties) EXPECT_EQ(message.data1, 0); EXPECT_EQ(message.data2, 0); EXPECT_EQ(message.valid, false); - EXPECT_EQ(message.getSysExSize(), 0); + EXPECT_EQ(message.getSysExSize(), unsigned(0)); } template @@ -39,7 +39,7 @@ TEST(MidiMessage, getSysExSize) // Small message { typedef midi::Message<32> Message; - ASSERT_EQ(Message::sSysExMaxSize, 32); + ASSERT_EQ(Message::sSysExMaxSize, unsigned(32)); Message message = Message(); const unsigned sizeUnder = 20; @@ -48,12 +48,12 @@ TEST(MidiMessage, getSysExSize) const unsigned sizeOver = 64; setSysExSize(message, sizeOver); - ASSERT_EQ(message.getSysExSize(), 32); + ASSERT_EQ(message.getSysExSize(), unsigned(32)); } // Medium message { typedef midi::Message<256> Message; - ASSERT_EQ(Message::sSysExMaxSize, 256); + ASSERT_EQ(Message::sSysExMaxSize, unsigned(256)); Message message = Message(); const unsigned sizeUnder = 200; @@ -62,12 +62,12 @@ TEST(MidiMessage, getSysExSize) const unsigned sizeOver = 300; setSysExSize(message, sizeOver); - ASSERT_EQ(message.getSysExSize(), 256); + ASSERT_EQ(message.getSysExSize(), unsigned(256)); } // Large message { typedef midi::Message<1024> Message; - ASSERT_EQ(Message::sSysExMaxSize, 1024); + ASSERT_EQ(Message::sSysExMaxSize, unsigned(1024)); Message message = Message(); const unsigned sizeUnder = 1000; @@ -76,7 +76,7 @@ TEST(MidiMessage, getSysExSize) const unsigned sizeOver = 2000; setSysExSize(message, sizeOver); - ASSERT_EQ(message.getSysExSize(), 1024); + ASSERT_EQ(message.getSysExSize(), unsigned(1024)); } } diff --git a/test/unit-tests/tests/unit-tests_MidiOutput.cpp b/test/unit-tests/tests/unit-tests_MidiOutput.cpp index 6f781f7..c1bcd49 100644 --- a/test/unit-tests/tests/unit-tests_MidiOutput.cpp +++ b/test/unit-tests/tests/unit-tests_MidiOutput.cpp @@ -302,7 +302,7 @@ TEST(MidiOutput, sendSysEx) // Small frame { static const char* frame = "Hello, World!"; - static const unsigned frameLength = strlen(frame); + static const int frameLength = strlen(frame); static const byte expected[] = { 0xf0, 'H', 'e', 'l', 'l', 'o', ',', ' ', 'W', 'o', 'r', 'l', 'd', '!', @@ -321,7 +321,7 @@ TEST(MidiOutput, sendSysEx) // Large frame { static const char* frame = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin maximus dui a massa maximus, a vestibulum mi venenatis. Cras sit amet ex id velit suscipit pharetra eget a turpis. Phasellus interdum metus ac sagittis cursus. Nam quis est at nisl ullamcorper egestas pulvinar eu erat. Duis a elit dignissim, vestibulum eros vel, tempus nisl. Aenean turpis nunc, cursus vel lacinia non, pharetra eget sapien. Duis condimentum, lacus at pulvinar tempor, leo libero volutpat nisl, eget porttitor lorem mi sed magna. Duis dictum, massa vel euismod interdum, lorem mi egestas elit, hendrerit tincidunt est arcu a libero. Interdum et malesuada fames ac ante ipsum primis in faucibus. Curabitur vehicula magna libero, at rhoncus sem ornare a. In elementum, elit et congue pulvinar, massa velit commodo velit, non elementum purus ligula eget lacus. Donec efficitur nisi eu ultrices efficitur. Donec neque dui, ullamcorper id molestie quis, consequat sit amet ligula."; - static const unsigned frameLength = strlen(frame); + static const int frameLength = strlen(frame); static const byte expected[] = { 0xf0, 'L','o','r','e','m',' ','i','p','s','u','m',' ','d','o','l','o','r',' ','s','i','t',' ','a','m','e','t',',',' ', diff --git a/test/unit-tests/tests/unit-tests_Settings.cpp b/test/unit-tests/tests/unit-tests_Settings.cpp index 49a3613..adedf1d 100644 --- a/test/unit-tests/tests/unit-tests_Settings.cpp +++ b/test/unit-tests/tests/unit-tests_Settings.cpp @@ -21,7 +21,7 @@ TEST(Settings, hasTheRightDefaultValues) EXPECT_EQ(midi::DefaultSettings::HandleNullVelocityNoteOnAsNoteOff, true); EXPECT_EQ(midi::DefaultSettings::Use1ByteParsing, true); EXPECT_EQ(midi::DefaultSettings::BaudRate, 31250); - EXPECT_EQ(midi::DefaultSettings::SysExMaxSize, 128); + EXPECT_EQ(midi::DefaultSettings::SysExMaxSize, unsigned(128)); } END_UNNAMED_NAMESPACE diff --git a/test/unit-tests/tests/unit-tests_SysExCodec.cpp b/test/unit-tests/tests/unit-tests_SysExCodec.cpp index ae0ab6d..e1b9428 100644 --- a/test/unit-tests/tests/unit-tests_SysExCodec.cpp +++ b/test/unit-tests/tests/unit-tests_SysExCodec.cpp @@ -19,7 +19,7 @@ TEST(SysExCodec, Encoder) byte buffer[16]; memset(buffer, 0, 16 * sizeof(byte)); const unsigned encodedSize = midi::encodeSysEx(input, buffer, 13); - EXPECT_EQ(encodedSize, 15); + EXPECT_EQ(encodedSize, unsigned(15)); const byte expected[16] = { 0, 'H', 'e', 'l', 'l', 'o', ',', ' ', 0, 'W', 'o', 'r', 'l', 'd', '!', 0, @@ -36,7 +36,7 @@ TEST(SysExCodec, Encoder) byte buffer[16]; memset(buffer, 0, 16 * sizeof(byte)); const unsigned encodedSize = midi::encodeSysEx(input, buffer, 12); - EXPECT_EQ(encodedSize, 14); + EXPECT_EQ(encodedSize, unsigned(14)); const byte expected[16] = { // MSB Data 120, 54, 108, 39, 49, 61, 91, 120, @@ -58,7 +58,7 @@ TEST(SysExCodec, Decoder) byte buffer[16]; memset(buffer, 0, 16 * sizeof(byte)); const unsigned decodedSize = midi::decodeSysEx(input, buffer, 15); - EXPECT_EQ(decodedSize, 13); + EXPECT_EQ(decodedSize, unsigned(13)); const byte expected[16] = { 'H', 'e', 'l', 'l', 'o', ',', ' ', 'W', 'o', 'r', 'l', 'd', '!', 0, 0, 0, @@ -76,7 +76,7 @@ TEST(SysExCodec, Decoder) byte buffer[16]; memset(buffer, 0, 16 * sizeof(byte)); const unsigned encodedSize = midi::decodeSysEx(input, buffer, 14); - EXPECT_EQ(encodedSize, 12); + EXPECT_EQ(encodedSize, unsigned(12)); const byte expected[16] = { 182, 236, 167, 177, 61, 91, 120, 107, 94, 209, 87, 94, 0, 0, @@ -97,9 +97,9 @@ TEST(SysExCodec, Codec) memset(buffer1, 0, 16 * sizeof(byte)); memset(buffer2, 0, 16 * sizeof(byte)); const unsigned encodedSize = midi::encodeSysEx(input, buffer1, 13); - EXPECT_EQ(encodedSize, 15); + EXPECT_EQ(encodedSize, unsigned(15)); const unsigned decodedSize = midi::decodeSysEx(buffer1, buffer2, encodedSize); - EXPECT_EQ(decodedSize, 13); + EXPECT_EQ(decodedSize, unsigned(13)); EXPECT_STREQ(reinterpret_cast(buffer2), reinterpret_cast(input)); } @@ -115,9 +115,9 @@ TEST(SysExCodec, Codec) memset(buffer1, 0, 14 * sizeof(byte)); memset(buffer2, 0, 12 * sizeof(byte)); const unsigned encodedSize = midi::encodeSysEx(input, buffer1, 12); - EXPECT_EQ(encodedSize, 14); + EXPECT_EQ(encodedSize, unsigned(14)); const unsigned decodedSize = midi::decodeSysEx(buffer1, buffer2, encodedSize); - EXPECT_EQ(decodedSize, 12); + EXPECT_EQ(decodedSize, unsigned(12)); EXPECT_THAT(buffer2, ContainerEq(input)); } }