| Index: media/audio/mac/audio_auhal_mac_unittest.cc
|
| diff --git a/media/audio/mac/audio_auhal_mac_unittest.cc b/media/audio/mac/audio_auhal_mac_unittest.cc
|
| index 4e63e5dffa3030683e2db6b451b368cfb3680571..07b16375ee6d3782c92cc78a6f02f135fd99eb53 100644
|
| --- a/media/audio/mac/audio_auhal_mac_unittest.cc
|
| +++ b/media/audio/mac/audio_auhal_mac_unittest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/synchronization/waitable_event.h"
|
| #include "media/audio/audio_io.h"
|
| #include "media/audio/audio_manager.h"
|
| +#include "media/audio/audio_unittest_utils.h"
|
| #include "media/audio/mock_audio_source_callback.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -46,7 +47,7 @@ class AUHALStreamTest : public testing::Test {
|
| manager_->GetDefaultOutputStreamParameters(), "");
|
| }
|
|
|
| - bool CanRunAudioTests() {
|
| + bool OutputDevicesAvailable() {
|
| return manager_->HasAudioOutputDevices();
|
| }
|
|
|
| @@ -60,8 +61,7 @@ class AUHALStreamTest : public testing::Test {
|
| };
|
|
|
| TEST_F(AUHALStreamTest, HardwareSampleRate) {
|
| - if (!CanRunAudioTests())
|
| - return;
|
| + CAN_RUN_AUDIO_TEST_IF(OutputDevicesAvailable());
|
| const AudioParameters preferred_params =
|
| manager_->GetDefaultOutputStreamParameters();
|
| EXPECT_GE(preferred_params.sample_rate(), 16000);
|
| @@ -69,22 +69,19 @@ TEST_F(AUHALStreamTest, HardwareSampleRate) {
|
| }
|
|
|
| TEST_F(AUHALStreamTest, CreateClose) {
|
| - if (!CanRunAudioTests())
|
| - return;
|
| + CAN_RUN_AUDIO_TEST_IF(OutputDevicesAvailable());
|
| Create()->Close();
|
| }
|
|
|
| TEST_F(AUHALStreamTest, CreateOpenClose) {
|
| - if (!CanRunAudioTests())
|
| - return;
|
| + CAN_RUN_AUDIO_TEST_IF(OutputDevicesAvailable());
|
| AudioOutputStream* stream = Create();
|
| EXPECT_TRUE(stream->Open());
|
| stream->Close();
|
| }
|
|
|
| TEST_F(AUHALStreamTest, CreateOpenStartStopClose) {
|
| - if (!CanRunAudioTests())
|
| - return;
|
| + CAN_RUN_AUDIO_TEST_IF(OutputDevicesAvailable());
|
|
|
| AudioOutputStream* stream = Create();
|
| EXPECT_TRUE(stream->Open());
|
|
|