audio: Update audio config impl unittest
No behavior change. Use relative number rather than absolute number to
count the observer change called. This change makes the tests easier to
update in future. Also make it consistent with other tests.
Bug: None
Test: *CrosAudioConfigImplTest*
Change-Id: I761d97d9146d1581d0781b966ac0f60b1c1f5ae9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5177328
Reviewed-by: Ching Yun Chang <whalechang@google.com>
Commit-Queue: Wenyu Zhang <zhangwenyu@google.com>
Cr-Commit-Position: refs/heads/main@{#1244642}
diff --git a/chromeos/ash/components/audio/cros_audio_config_impl_unittest.cc b/chromeos/ash/components/audio/cros_audio_config_impl_unittest.cc
index 6869ba18..fdf6b0b 100644
--- a/chromeos/ash/components/audio/cros_audio_config_impl_unittest.cc
+++ b/chromeos/ash/components/audio/cros_audio_config_impl_unittest.cc
@@ -422,8 +422,10 @@
TEST_F(CrosAudioConfigImplTest, HandleExternalInputGainUpdate) {
std::unique_ptr<FakeAudioSystemPropertiesObserver> fake_observer = Observe();
+ size_t expected_observer_calls = 1u;
// |fake_observer| count is first incremented in Observe() method.
- ASSERT_EQ(1u, fake_observer->num_properties_updated_calls_);
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
ASSERT_TRUE(fake_observer->last_audio_system_properties_.has_value());
ASSERT_EQ(
kDefaultInputGainPercent,
@@ -431,7 +433,9 @@
SetInputGainPercent(kTestInputGainPercent);
- ASSERT_EQ(2u, fake_observer->num_properties_updated_calls_);
+ expected_observer_calls++;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
ASSERT_TRUE(fake_observer->last_audio_system_properties_.has_value());
ASSERT_EQ(
kTestInputGainPercent,
@@ -440,15 +444,19 @@
TEST_F(CrosAudioConfigImplTest, GetSetOutputVolumePercent) {
std::unique_ptr<FakeAudioSystemPropertiesObserver> fake_observer = Observe();
+ size_t expected_observer_calls = 1u;
// |fake_observer| count is first incremented in Observe() method.
- ASSERT_EQ(1u, fake_observer->num_properties_updated_calls_);
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
ASSERT_TRUE(fake_observer->last_audio_system_properties_.has_value());
ASSERT_EQ(kDefaultOutputVolumePercent,
fake_observer->last_audio_system_properties_.value()
->output_volume_percent);
SetOutputVolumePercent(kTestOutputVolumePercent);
- ASSERT_EQ(2u, fake_observer->num_properties_updated_calls_);
+ expected_observer_calls++;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
EXPECT_EQ(kTestOutputVolumePercent,
fake_observer->last_audio_system_properties_.value()
->output_volume_percent);
@@ -457,7 +465,9 @@
TEST_F(CrosAudioConfigImplTest, SetInputGainPercent) {
std::unique_ptr<FakeAudioSystemPropertiesObserver> fake_observer = Observe();
// |fake_observer| count is first incremented in Observe() method.
- ASSERT_EQ(1u, fake_observer->num_properties_updated_calls_);
+ size_t expected_observer_calls = 1u;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
ASSERT_TRUE(fake_observer->last_audio_system_properties_.has_value());
ASSERT_EQ(
kDefaultInputGainPercent,
@@ -468,7 +478,9 @@
// This check relies on the fact that when CrasAudioHandler receives a call to
// change the input gain, it will notify all observers, one of which is
// |fake_observer|.
- ASSERT_EQ(2u, fake_observer->num_properties_updated_calls_);
+ expected_observer_calls++;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
EXPECT_EQ(
kTestInputGainPercent,
fake_observer->last_audio_system_properties_.value()->input_gain_percent);
@@ -476,9 +488,11 @@
TEST_F(CrosAudioConfigImplTest, GetSetOutputVolumePercentMuteThresholdTest) {
std::unique_ptr<FakeAudioSystemPropertiesObserver> fake_observer = Observe();
+ size_t expected_observer_calls = 1u;
// |fake_observer| count is first incremented in Observe() method.
- ASSERT_EQ(1u, fake_observer->num_properties_updated_calls_);
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
ASSERT_TRUE(fake_observer->last_audio_system_properties_.has_value());
ASSERT_EQ(kDefaultOutputVolumePercent,
fake_observer->last_audio_system_properties_.value()
@@ -486,7 +500,9 @@
// Test setting volume over mute threshold when muted.
SetOutputMuteState(mojom::MuteState::kMutedByUser);
- ASSERT_EQ(2u, fake_observer->num_properties_updated_calls_);
+ expected_observer_calls++;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
EXPECT_EQ(
mojom::MuteState::kMutedByUser,
fake_observer->last_audio_system_properties_.value()->output_mute_state);
@@ -495,7 +511,9 @@
// |fake_observer| should be notified twice due to mute state changing when
// setting volume over the mute threshold.
- ASSERT_EQ(4u, fake_observer->num_properties_updated_calls_);
+ expected_observer_calls += 2u;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
EXPECT_EQ(
mojom::MuteState::kNotMuted,
fake_observer->last_audio_system_properties_.value()->output_mute_state);
@@ -504,14 +522,18 @@
->output_volume_percent);
// Test setting volume under mute threshold when muted.
+ expected_observer_calls++;
SetOutputMuteState(mojom::MuteState::kMutedByUser);
- ASSERT_EQ(5u, fake_observer->num_properties_updated_calls_);
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
EXPECT_EQ(
mojom::MuteState::kMutedByUser,
fake_observer->last_audio_system_properties_.value()->output_mute_state);
SetOutputVolumePercent(kTestUnderMuteThreshholdVolumePercent);
- ASSERT_EQ(6u, fake_observer->num_properties_updated_calls_);
+ expected_observer_calls++;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
EXPECT_EQ(
mojom::MuteState::kMutedByUser,
fake_observer->last_audio_system_properties_.value()->output_mute_state);
@@ -522,9 +544,11 @@
TEST_F(CrosAudioConfigImplTest, SetInputGainPercentWhileMuted) {
std::unique_ptr<FakeAudioSystemPropertiesObserver> fake_observer = Observe();
+ size_t expected_observer_calls = 1u;
// |fake_observer| count is first incremented in Observe() method.
- ASSERT_EQ(1u, fake_observer->num_properties_updated_calls_);
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
ASSERT_TRUE(fake_observer->last_audio_system_properties_.has_value());
ASSERT_EQ(
kDefaultInputGainPercent,
@@ -532,7 +556,9 @@
// Test setting gain when muted.
SetInputMuteState(mojom::MuteState::kMutedByUser);
- ASSERT_EQ(2u, fake_observer->num_properties_updated_calls_);
+ expected_observer_calls++;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
EXPECT_EQ(
mojom::MuteState::kMutedByUser,
fake_observer->last_audio_system_properties_.value()->input_mute_state);
@@ -541,7 +567,9 @@
// |fake_observer| should be notified twice due to mute state changing when
// setting gain.
- ASSERT_EQ(4u, fake_observer->num_properties_updated_calls_);
+ expected_observer_calls += 2u;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
EXPECT_EQ(
mojom::MuteState::kNotMuted,
fake_observer->last_audio_system_properties_.value()->input_mute_state);
@@ -552,9 +580,11 @@
TEST_F(CrosAudioConfigImplTest, GetSetOutputVolumePercentVolumeBoundariesTest) {
std::unique_ptr<FakeAudioSystemPropertiesObserver> fake_observer = Observe();
+ size_t expected_observer_calls = 1u;
// |fake_observer| count is first incremented in Observe() method.
- ASSERT_EQ(1u, fake_observer->num_properties_updated_calls_);
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
ASSERT_TRUE(fake_observer->last_audio_system_properties_.has_value());
ASSERT_EQ(kDefaultOutputVolumePercent,
fake_observer->last_audio_system_properties_.value()
@@ -562,33 +592,43 @@
// Test setting volume over max volume.
SetOutputVolumePercent(kTestOverMaxOutputVolumePercent);
- ASSERT_EQ(2u, fake_observer->num_properties_updated_calls_);
+ expected_observer_calls++;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
EXPECT_EQ(100u, fake_observer->last_audio_system_properties_.value()
->output_volume_percent);
// Test setting volume under min volume.
SetOutputVolumePercent(kTestUnderMinOutputVolumePercent);
- ASSERT_EQ(3u, fake_observer->num_properties_updated_calls_);
+ expected_observer_calls++;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
EXPECT_EQ(0u, fake_observer->last_audio_system_properties_.value()
->output_volume_percent);
}
TEST_F(CrosAudioConfigImplTest, GetOutputMuteState) {
std::unique_ptr<FakeAudioSystemPropertiesObserver> fake_observer = Observe();
- ASSERT_EQ(1u, fake_observer->num_properties_updated_calls_);
+ size_t expected_observer_calls = 1u;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
ASSERT_TRUE(fake_observer->last_audio_system_properties_.has_value());
EXPECT_EQ(
mojom::MuteState::kNotMuted,
fake_observer->last_audio_system_properties_.value()->output_mute_state);
SetOutputMuteState(mojom::MuteState::kMutedByUser);
- ASSERT_EQ(2u, fake_observer->num_properties_updated_calls_);
+ expected_observer_calls++;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
EXPECT_EQ(
mojom::MuteState::kMutedByUser,
fake_observer->last_audio_system_properties_.value()->output_mute_state);
SetOutputMuteState(mojom::MuteState::kNotMuted);
- ASSERT_EQ(3u, fake_observer->num_properties_updated_calls_);
+ expected_observer_calls++;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
EXPECT_EQ(
mojom::MuteState::kNotMuted,
fake_observer->last_audio_system_properties_.value()->output_mute_state);
@@ -597,7 +637,9 @@
TEST_F(CrosAudioConfigImplTest, HandleOutputMuteStateMutedByPolicy) {
SetOutputMuteState(mojom::MuteState::kMutedByPolicy);
std::unique_ptr<FakeAudioSystemPropertiesObserver> fake_observer = Observe();
- ASSERT_EQ(1u, fake_observer->num_properties_updated_calls_);
+ size_t expected_observer_calls = 1u;
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
ASSERT_TRUE(fake_observer->last_audio_system_properties_.has_value());
EXPECT_EQ(
mojom::MuteState::kMutedByPolicy,
@@ -606,7 +648,8 @@
// Simulate attempting to change mute state while policy is enabled.
SimulateSetOutputMuted(/*muted=*/true);
SimulateSetOutputMuted(/*muted=*/false);
- ASSERT_EQ(1u, fake_observer->num_properties_updated_calls_);
+ ASSERT_EQ(expected_observer_calls,
+ fake_observer->num_properties_updated_calls_);
ASSERT_TRUE(fake_observer->last_audio_system_properties_.has_value());
EXPECT_EQ(
mojom::MuteState::kMutedByPolicy,
@@ -849,7 +892,7 @@
InsertAudioNode(kMicJack);
// Multiple calls to observer triggered by setting active nodes triggered by
// AudioObserver events gain, active input and nodes changed.
- expected_observer_calls += 3;
+ expected_observer_calls += 3u;
ASSERT_EQ(expected_observer_calls,
fake_observer->num_properties_updated_calls_);
@@ -863,7 +906,7 @@
RemoveAudioNode(kMicJackId);
// Multiple calls to observer triggered by setting active nodes triggered by
// AudioObserver events active input and nodes changed.
- expected_observer_calls += 2;
+ expected_observer_calls += 2u;
ASSERT_EQ(expected_observer_calls,
fake_observer->num_properties_updated_calls_);
