Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: trunk/src/media/midi/midi_message_queue_unittest.cc

Issue 93583002: Revert 237558 "Use MIDIMessageQueue/IsValidWebMIDIData for MIDI ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/media/midi/midi_message_queue.cc ('k') | trunk/src/media/midi/midi_message_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/midi/midi_message_queue_unittest.cc
===================================================================
--- trunk/src/media/midi/midi_message_queue_unittest.cc (revision 237659)
+++ trunk/src/media/midi/midi_message_queue_unittest.cc (working copy)
@@ -1,173 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "media/midi/midi_message_queue.h"
-
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace media {
-namespace {
-
-const uint8 kGMOn[] = { 0xf0, 0x7e, 0x7f, 0x09, 0x01, 0xf7 };
-const uint8 kGSOn[] = {
- 0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0x00, 0x7f, 0x00, 0x41, 0xf7,
-};
-const uint8 kNoteOn[] = { 0x90, 0x3c, 0x7f };
-const uint8 kNoteOnWithRunningStatus[] = {
- 0x90, 0x3c, 0x7f, 0x3c, 0x7f, 0x3c, 0x7f,
-};
-const uint8 kChannelPressure[] = { 0xd0, 0x01 };
-const uint8 kChannelPressureWithRunningStatus[] = {
- 0xd0, 0x01, 0x01, 0x01,
-};
-const uint8 kTimingClock[] = { 0xf8 };
-const uint8 kBrokenData1[] = { 0x90 };
-const uint8 kBrokenData2[] = { 0xf7 };
-const uint8 kBrokenData3[] = { 0xf2, 0x00 };
-const uint8 kDataByte0[] = { 0x00 };
-
-template <typename T, size_t N>
-void Add(MIDIMessageQueue* queue, const T(&array)[N]) {
- queue->Add(array, N);
-}
-
-template <typename T, size_t N>
-::testing::AssertionResult ExpectEqualSequence(
- const char* expr1, const char* expr2,
- const T(&expected)[N], const std::vector<T>& actual) {
- if (actual.size() != N) {
- return ::testing::AssertionFailure()
- << "expected: " << ::testing::PrintToString(expected)
- << ", actual: " << ::testing::PrintToString(actual);
- }
- for (size_t i = 0; i < N; ++i) {
- if (expected[i] != actual[i]) {
- return ::testing::AssertionFailure()
- << "expected: " << ::testing::PrintToString(expected)
- << ", actual: " << ::testing::PrintToString(actual);
- }
- }
- return ::testing::AssertionSuccess();
-}
-
-#define EXPECT_MESSAGE(expected, actual) \
- EXPECT_PRED_FORMAT2(ExpectEqualSequence, expected, actual)
-
-TEST(MIDIMessageQueueTest, EmptyData) {
- MIDIMessageQueue queue(false);
- std::vector<uint8> message;
- queue.Get(&message);
- EXPECT_TRUE(message.empty());
-}
-
-TEST(MIDIMessageQueueTest, RunningStatusDisabled) {
- MIDIMessageQueue queue(false);
- Add(&queue, kGMOn);
- Add(&queue, kBrokenData1);
- Add(&queue, kNoteOnWithRunningStatus);
- Add(&queue, kBrokenData2);
- Add(&queue, kChannelPressureWithRunningStatus);
- Add(&queue, kBrokenData3);
- Add(&queue, kNoteOn);
- Add(&queue, kBrokenData1);
- Add(&queue, kGSOn);
- Add(&queue, kBrokenData2);
- Add(&queue, kTimingClock);
- Add(&queue, kBrokenData3);
-
- std::vector<uint8> message;
- queue.Get(&message);
- EXPECT_MESSAGE(kGMOn, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kNoteOn, message) << "Running status should be ignored";
- queue.Get(&message);
- EXPECT_MESSAGE(kChannelPressure, message)
- << "Running status should be ignored";
- queue.Get(&message);
- EXPECT_MESSAGE(kNoteOn, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kGSOn, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kTimingClock, message);
- queue.Get(&message);
- EXPECT_TRUE(message.empty());
-}
-
-TEST(MIDIMessageQueueTest, RunningStatusEnabled) {
- MIDIMessageQueue queue(true);
- Add(&queue, kGMOn);
- Add(&queue, kBrokenData1);
- Add(&queue, kNoteOnWithRunningStatus);
- Add(&queue, kBrokenData2);
- Add(&queue, kChannelPressureWithRunningStatus);
- Add(&queue, kBrokenData3);
- Add(&queue, kNoteOn);
- Add(&queue, kBrokenData1);
- Add(&queue, kGSOn);
- Add(&queue, kBrokenData2);
- Add(&queue, kTimingClock);
- Add(&queue, kDataByte0);
-
- std::vector<uint8> message;
- queue.Get(&message);
- EXPECT_MESSAGE(kGMOn, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kNoteOn, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kNoteOn, message)
- << "Running status should be converted into a canonical MIDI message";
- queue.Get(&message);
- EXPECT_MESSAGE(kNoteOn, message)
- << "Running status should be converted into a canonical MIDI message";
- queue.Get(&message);
- EXPECT_MESSAGE(kChannelPressure, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kChannelPressure, message)
- << "Running status should be converted into a canonical MIDI message";
- queue.Get(&message);
- EXPECT_MESSAGE(kChannelPressure, message)
- << "Running status should be converted into a canonical MIDI message";
- queue.Get(&message);
- EXPECT_MESSAGE(kNoteOn, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kGSOn, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kTimingClock, message);
- queue.Get(&message);
- EXPECT_TRUE(message.empty())
- << "Running status must not be applied to real time messages";
-}
-
-TEST(MIDIMessageQueueTest, RunningStatusEnabledWithRealTimeEvent) {
- MIDIMessageQueue queue(true);
- const uint8 kNoteOnWithRunningStatusWithkTimingClock[] = {
- 0x90, 0xf8, 0x3c, 0xf8, 0x7f, 0xf8, 0x3c, 0xf8, 0x7f, 0xf8, 0x3c, 0xf8,
- 0x7f,
- };
- Add(&queue, kNoteOnWithRunningStatusWithkTimingClock);
- std::vector<uint8> message;
- queue.Get(&message);
- EXPECT_MESSAGE(kTimingClock, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kTimingClock, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kNoteOn, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kTimingClock, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kTimingClock, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kNoteOn, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kTimingClock, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kTimingClock, message);
- queue.Get(&message);
- EXPECT_MESSAGE(kNoteOn, message);
- queue.Get(&message);
- EXPECT_TRUE(message.empty());
-}
-
-} // namespace
-} // namespace media
« no previous file with comments | « trunk/src/media/midi/midi_message_queue.cc ('k') | trunk/src/media/midi/midi_message_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698