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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/audio_device/test/audio_device_test_api.cc

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. Created 3 years, 10 months 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
« webrtc/base/event.cc ('K') | « webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc ('k') | webrtc/modules/audio_device/win/audio_device_core_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_device/test/audio_device_test_api.cc
diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc
index 2f2780685d896c4ee6aa183adfc8e165256fc2e6..944164526628f6d0d2f80d5f3e9d195ba52cb963 100644
--- a/webrtc/modules/audio_device/test/audio_device_test_api.cc
+++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc
@@ -170,78 +170,83 @@ class AudioDeviceAPITest: public testing::Test {
#if defined(_WIN32)
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL);
+ kId, AudioDeviceModule::kLinuxAlsaAudio)) == nullptr);
#if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
TEST_LOG("WEBRTC_WINDOWS_CORE_AUDIO_BUILD is defined!\n\n");
// create default implementation (=Core Audio) instance
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
+ kId, AudioDeviceModule::kPlatformDefaultAudio)) !=
+ nullptr);
EXPECT_EQ(0, audio_device_.release()->Release());
// create non-default (=Wave Audio) instance
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kWindowsWaveAudio)) != NULL);
+ kId, AudioDeviceModule::kWindowsWaveAudio)) != nullptr);
EXPECT_EQ(0, audio_device_.release()->Release());
// explicitly specify usage of Core Audio (same as default)
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kWindowsCoreAudio)) != NULL);
+ kId, AudioDeviceModule::kWindowsCoreAudio)) != nullptr);
#else
TEST_LOG("WEBRTC_WINDOWS_CORE_AUDIO_BUILD is *not* defined!\n");
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
+ kId, AudioDeviceModule::kWindowsCoreAudio)) == nullptr);
// create default implementation (=Wave Audio) instance
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
+ kId, AudioDeviceModule::kPlatformDefaultAudio)) !=
+ nullptr);
EXPECT_EQ(0, audio_device_.release()->Release());
// explicitly specify usage of Wave Audio (same as default)
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kWindowsWaveAudio)) != NULL);
+ kId, AudioDeviceModule::kWindowsWaveAudio)) != nullptr);
#endif
#endif
#if defined(ANDROID)
// Fails tests
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
+ kId, AudioDeviceModule::kWindowsWaveAudio)) == nullptr);
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
+ kId, AudioDeviceModule::kWindowsCoreAudio)) == nullptr);
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL);
+ kId, AudioDeviceModule::kLinuxAlsaAudio)) == nullptr);
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kLinuxPulseAudio)) == NULL);
+ kId, AudioDeviceModule::kLinuxPulseAudio)) == nullptr);
// Create default implementation instance
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
+ kId, AudioDeviceModule::kPlatformDefaultAudio)) !=
+ nullptr);
#elif defined(WEBRTC_LINUX)
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
+ kId, AudioDeviceModule::kWindowsWaveAudio)) == nullptr);
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
+ kId, AudioDeviceModule::kWindowsCoreAudio)) == nullptr);
// create default implementation instance
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
+ kId, AudioDeviceModule::kPlatformDefaultAudio)) !=
+ nullptr);
EXPECT_EQ(0, audio_device_->Terminate());
EXPECT_EQ(0, audio_device_.release()->Release());
// explicitly specify usage of Pulse Audio (same as default)
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kLinuxPulseAudio)) != NULL);
+ kId, AudioDeviceModule::kLinuxPulseAudio)) != nullptr);
#endif
#if defined(WEBRTC_MAC)
// Fails tests
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
+ kId, AudioDeviceModule::kWindowsWaveAudio)) == nullptr);
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
+ kId, AudioDeviceModule::kWindowsCoreAudio)) == nullptr);
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL);
+ kId, AudioDeviceModule::kLinuxAlsaAudio)) == nullptr);
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kLinuxPulseAudio)) == NULL);
+ kId, AudioDeviceModule::kLinuxPulseAudio)) == nullptr);
// Create default implementation instance
EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
- kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
+ kId, AudioDeviceModule::kPlatformDefaultAudio)) !=
+ nullptr);
#endif
- if (audio_device_ == NULL) {
+ if (audio_device_ == nullptr) {
FAIL() << "Failed creating audio device object!";
}
@@ -263,11 +268,11 @@ class AudioDeviceAPITest: public testing::Test {
}
if (event_observer_) {
delete event_observer_;
- event_observer_ = NULL;
+ event_observer_ = nullptr;
}
if (audio_transport_) {
delete audio_transport_;
- audio_transport_ = NULL;
+ audio_transport_ = nullptr;
}
if (audio_device_)
EXPECT_EQ(0, audio_device_.release()->Release());
@@ -318,21 +323,21 @@ class AudioDeviceAPITest: public testing::Test {
bool AudioDeviceAPITest::linux_alsa_ = false;
std::unique_ptr<ProcessThread> AudioDeviceAPITest::process_thread_;
rtc::scoped_refptr<AudioDeviceModule> AudioDeviceAPITest::audio_device_;
-AudioTransportAPI* AudioDeviceAPITest::audio_transport_ = NULL;
-AudioEventObserverAPI* AudioDeviceAPITest::event_observer_ = NULL;
+AudioTransportAPI* AudioDeviceAPITest::audio_transport_ = nullptr;
+AudioEventObserverAPI* AudioDeviceAPITest::event_observer_ = nullptr;
TEST_F(AudioDeviceAPITest, RegisterEventObserver) {
event_observer_ = new AudioEventObserverAPI(audio_device_);
- EXPECT_EQ(0, audio_device_->RegisterEventObserver(NULL));
+ EXPECT_EQ(0, audio_device_->RegisterEventObserver(nullptr));
EXPECT_EQ(0, audio_device_->RegisterEventObserver(event_observer_));
- EXPECT_EQ(0, audio_device_->RegisterEventObserver(NULL));
+ EXPECT_EQ(0, audio_device_->RegisterEventObserver(nullptr));
}
TEST_F(AudioDeviceAPITest, RegisterAudioCallback) {
audio_transport_ = new AudioTransportAPI(audio_device_);
- EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
+ EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
EXPECT_EQ(0, audio_device_->RegisterAudioCallback(audio_transport_));
- EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
+ EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
}
TEST_F(AudioDeviceAPITest, Init) {
@@ -379,19 +384,19 @@ TEST_F(AudioDeviceAPITest, PlayoutDeviceName) {
// fail tests
EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(-2, name, guid));
EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(no_devices, name, guid));
- EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(0, NULL, guid));
+ EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(0, nullptr, guid));
// bulk tests
- EXPECT_EQ(0, audio_device_->PlayoutDeviceName(0, name, NULL));
+ EXPECT_EQ(0, audio_device_->PlayoutDeviceName(0, name, nullptr));
#ifdef _WIN32
// shall be mapped to 0.
- EXPECT_EQ(0, audio_device_->PlayoutDeviceName(-1, name, NULL));
+ EXPECT_EQ(0, audio_device_->PlayoutDeviceName(-1, name, nullptr));
#else
- EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(-1, name, NULL));
+ EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(-1, name, nullptr));
#endif
for (int i = 0; i < no_devices; i++) {
EXPECT_EQ(0, audio_device_->PlayoutDeviceName(i, name, guid));
- EXPECT_EQ(0, audio_device_->PlayoutDeviceName(i, name, NULL));
+ EXPECT_EQ(0, audio_device_->PlayoutDeviceName(i, name, nullptr));
}
}
@@ -403,19 +408,19 @@ TEST_F(AudioDeviceAPITest, RecordingDeviceName) {
// fail tests
EXPECT_EQ(-1, audio_device_->RecordingDeviceName(-2, name, guid));
EXPECT_EQ(-1, audio_device_->RecordingDeviceName(no_devices, name, guid));
- EXPECT_EQ(-1, audio_device_->RecordingDeviceName(0, NULL, guid));
+ EXPECT_EQ(-1, audio_device_->RecordingDeviceName(0, nullptr, guid));
// bulk tests
- EXPECT_EQ(0, audio_device_->RecordingDeviceName(0, name, NULL));
+ EXPECT_EQ(0, audio_device_->RecordingDeviceName(0, name, nullptr));
#ifdef _WIN32
// shall me mapped to 0
- EXPECT_EQ(0, audio_device_->RecordingDeviceName(-1, name, NULL));
+ EXPECT_EQ(0, audio_device_->RecordingDeviceName(-1, name, nullptr));
#else
- EXPECT_EQ(-1, audio_device_->RecordingDeviceName(-1, name, NULL));
+ EXPECT_EQ(-1, audio_device_->RecordingDeviceName(-1, name, nullptr));
#endif
for (int i = 0; i < no_devices; i++) {
EXPECT_EQ(0, audio_device_->RecordingDeviceName(i, name, guid));
- EXPECT_EQ(0, audio_device_->RecordingDeviceName(i, name, NULL));
+ EXPECT_EQ(0, audio_device_->RecordingDeviceName(i, name, nullptr));
}
}
@@ -616,7 +621,7 @@ TEST_F(AudioDeviceAPITest, InitRecording) {
TEST_F(AudioDeviceAPITest, StartAndStopPlayout) {
bool available;
- EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
+ EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
CheckInitialPlayoutStates();
@@ -637,7 +642,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopPlayout) {
EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
EXPECT_EQ(0, audio_device_->StopPlayout());
EXPECT_FALSE(audio_device_->Playing());
- EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
+ EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
}
#endif
@@ -652,7 +657,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopPlayout) {
EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
EXPECT_EQ(0, audio_device_->StopPlayout());
EXPECT_FALSE(audio_device_->Playing());
- EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
+ EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
}
// repeat test for all devices
@@ -668,14 +673,14 @@ TEST_F(AudioDeviceAPITest, StartAndStopPlayout) {
EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
EXPECT_EQ(0, audio_device_->StopPlayout());
EXPECT_FALSE(audio_device_->Playing());
- EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
+ EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
}
}
}
TEST_F(AudioDeviceAPITest, StartAndStopRecording) {
bool available;
- EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
+ EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
CheckInitialRecordingStates();
@@ -696,7 +701,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopRecording) {
EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
EXPECT_EQ(0, audio_device_->StopRecording());
EXPECT_FALSE(audio_device_->Recording());
- EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
+ EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
}
#endif
@@ -711,7 +716,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopRecording) {
EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
EXPECT_EQ(0, audio_device_->StopRecording());
EXPECT_FALSE(audio_device_->Recording());
- EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
+ EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
}
// repeat test for all devices
@@ -727,7 +732,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopRecording) {
EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
EXPECT_EQ(0, audio_device_->StopRecording());
EXPECT_FALSE(audio_device_->Recording());
- EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL));
+ EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
}
}
}
@@ -787,7 +792,7 @@ TEST_F(AudioDeviceAPITest, SetAndGetWaveOutVolume) {
TEST_F(AudioDeviceAPITest, InitSpeaker) {
// NOTE: By calling Terminate (in TearDown) followed by Init (in SetUp) we
- // ensure that any existing output mixer handle is set to NULL.
+ // ensure that any existing output mixer handle is set to null.
// The mixer handle is closed and reopened again for each call to
// SetPlayoutDevice.
CheckInitialPlayoutStates();
@@ -821,7 +826,7 @@ TEST_F(AudioDeviceAPITest, InitSpeaker) {
TEST_F(AudioDeviceAPITest, InitMicrophone) {
// NOTE: By calling Terminate (in TearDown) followed by Init (in SetUp) we
- // ensure that any existing output mixer handle is set to NULL.
+ // ensure that any existing output mixer handle is set to null.
// The mixer handle is closed and reopened again for each call to
// SetRecordingDevice.
CheckInitialRecordingStates();
@@ -1612,7 +1617,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopRawOutputFileRecording) {
CheckInitialPlayoutStates();
// fail tests
- EXPECT_EQ(-1, audio_device_->StartRawOutputFileRecording(NULL));
+ EXPECT_EQ(-1, audio_device_->StartRawOutputFileRecording(nullptr));
// bulk tests
EXPECT_EQ(0, audio_device_->StartRawOutputFileRecording(
@@ -1648,7 +1653,7 @@ TEST_F(AudioDeviceAPITest, StartAndStopRawInputFileRecording) {
EXPECT_FALSE(audio_device_->Playing());
// fail tests
- EXPECT_EQ(-1, audio_device_->StartRawInputFileRecording(NULL));
+ EXPECT_EQ(-1, audio_device_->StartRawInputFileRecording(nullptr));
// bulk tests
EXPECT_EQ(0, audio_device_->StartRawInputFileRecording(
« webrtc/base/event.cc ('K') | « webrtc/modules/audio_device/mac/audio_mixer_manager_mac.cc ('k') | webrtc/modules/audio_device/win/audio_device_core_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698