Commit 964d2c65 authored by guidou's avatar guidou Committed by Commit Bot

Update MediaStreamConstraintsAudioUtil unit tests.

Use array elements instead of pointer values in comparisons involving
pointers to member functions.
One of these comparisons failed on Windows Debug and others are suspect
of failing on WinClang DLL builds.

BUG=736309

Review-Url: https://codereview.chromium.org/2958543002
Cr-Commit-Position: refs/heads/master@{#481932}
parent 834eaab8
...@@ -342,8 +342,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, SingleBoolConstraint) { ...@@ -342,8 +342,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, SingleBoolConstraint) {
for (auto set_function : kBoolSetFunctions) { for (auto set_function : kBoolSetFunctions) {
for (auto accessor : kFactoryAccessors) { for (auto accessor : kFactoryAccessors) {
// Ideal advanced is ignored by the SelectSettings algorithm. // Ideal advanced is ignored by the SelectSettings algorithm.
if (set_function == &blink::BooleanConstraint::SetIdeal && // Using array elements instead of pointer values due to the comparison
accessor == &MockConstraintFactory::AddAdvanced) { // failing on some build configurations.
if (set_function == kBoolSetFunctions[1] &&
accessor == kFactoryAccessors[1]) {
continue; continue;
} }
for (size_t i = 0; i < kMainSettings.size(); ++i) { for (size_t i = 0; i < kMainSettings.size(); ++i) {
...@@ -394,8 +396,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, SingleBoolConstraint) { ...@@ -394,8 +396,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, SingleBoolConstraint) {
for (auto set_function : kBoolSetFunctions) { for (auto set_function : kBoolSetFunctions) {
for (auto accessor : kFactoryAccessors) { for (auto accessor : kFactoryAccessors) {
// Ideal advanced is ignored by the SelectSettings algorithm. // Ideal advanced is ignored by the SelectSettings algorithm.
if (set_function == &blink::BooleanConstraint::SetIdeal && // Using array elements instead of pointer values due to the comparison
accessor == &MockConstraintFactory::AddAdvanced) { // failing on some build configurations.
if (set_function == kBoolSetFunctions[1] &&
accessor == kFactoryAccessors[1]) {
continue; continue;
} }
for (size_t i = 0; i < kAudioProcessingProperties.size(); ++i) { for (size_t i = 0; i < kAudioProcessingProperties.size(); ++i) {
...@@ -485,8 +489,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, EchoCancellationWithSw) { ...@@ -485,8 +489,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, EchoCancellationWithSw) {
for (auto set_function : kBoolSetFunctions) { for (auto set_function : kBoolSetFunctions) {
for (auto accessor : kFactoryAccessors) { for (auto accessor : kFactoryAccessors) {
// Ideal advanced is ignored by the SelectSettings algorithm. // Ideal advanced is ignored by the SelectSettings algorithm.
if (set_function == &blink::BooleanConstraint::SetIdeal && // Using array elements instead of pointer values due to the comparison
accessor == &MockConstraintFactory::AddAdvanced) { // failing on some build configurations.
if (set_function == kBoolSetFunctions[1] &&
accessor == kFactoryAccessors[1]) {
continue; continue;
} }
for (bool value : kBoolValues) { for (bool value : kBoolValues) {
...@@ -547,8 +553,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, EchoCancellationWithHw) { ...@@ -547,8 +553,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, EchoCancellationWithHw) {
for (auto set_function : kBoolSetFunctions) { for (auto set_function : kBoolSetFunctions) {
for (auto accessor : kFactoryAccessors) { for (auto accessor : kFactoryAccessors) {
// Ideal advanced is ignored by the SelectSettings algorithm. // Ideal advanced is ignored by the SelectSettings algorithm.
if (set_function == &blink::BooleanConstraint::SetIdeal && // Using array elements instead of pointer values due to the comparison
accessor == &MockConstraintFactory::AddAdvanced) { // failing on some build configurations.
if (set_function == kBoolSetFunctions[1] &&
accessor == kFactoryAccessors[1]) {
continue; continue;
} }
for (bool value : kBoolValues) { for (bool value : kBoolValues) {
...@@ -594,8 +602,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, GoogEchoCancellationWithSw) { ...@@ -594,8 +602,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, GoogEchoCancellationWithSw) {
for (auto set_function : kBoolSetFunctions) { for (auto set_function : kBoolSetFunctions) {
for (auto accessor : kFactoryAccessors) { for (auto accessor : kFactoryAccessors) {
// Ideal advanced is ignored by the SelectSettings algorithm. // Ideal advanced is ignored by the SelectSettings algorithm.
if (set_function == &blink::BooleanConstraint::SetIdeal && // Using array elements instead of pointers due to the comparison failing
accessor == &MockConstraintFactory::AddAdvanced) { // on compilers.
if (set_function == kBoolSetFunctions[1] &&
accessor == kFactoryAccessors[1]) {
continue; continue;
} }
for (bool value : kBoolValues) { for (bool value : kBoolValues) {
...@@ -639,8 +649,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, GoogEchoCancellationWithHw) { ...@@ -639,8 +649,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, GoogEchoCancellationWithHw) {
for (auto set_function : kBoolSetFunctions) { for (auto set_function : kBoolSetFunctions) {
for (auto accessor : kFactoryAccessors) { for (auto accessor : kFactoryAccessors) {
// Ideal advanced is ignored by the SelectSettings algorithm. // Ideal advanced is ignored by the SelectSettings algorithm.
if (set_function == &blink::BooleanConstraint::SetIdeal && // Using array elements instead of pointer values due to the comparison
accessor == &MockConstraintFactory::AddAdvanced) { // failing on some build configurations.
if (set_function == kBoolSetFunctions[1] &&
accessor == kFactoryAccessors[1]) {
continue; continue;
} }
for (bool value : kBoolValues) { for (bool value : kBoolValues) {
...@@ -721,8 +733,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, ...@@ -721,8 +733,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest,
for (auto set_function : kBoolSetFunctions) { for (auto set_function : kBoolSetFunctions) {
for (auto accessor : kFactoryAccessors) { for (auto accessor : kFactoryAccessors) {
// Ideal advanced is ignored by the SelectSettings algorithm. // Ideal advanced is ignored by the SelectSettings algorithm.
if (set_function == &blink::BooleanConstraint::SetIdeal && // Using array elements instead of pointer values due to the comparison
accessor == &MockConstraintFactory::AddAdvanced) { // failing on some build configurations.
if (set_function == kBoolSetFunctions[1] &&
accessor == kFactoryAccessors[1]) {
continue; continue;
} }
for (size_t i = 0; i < kAudioProcessingProperties.size(); ++i) { for (size_t i = 0; i < kAudioProcessingProperties.size(); ++i) {
...@@ -818,12 +832,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, ValidGeometry) { ...@@ -818,12 +832,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, ValidGeometry) {
for (auto set_function : kStringSetFunctions) { for (auto set_function : kStringSetFunctions) {
for (auto accessor : kFactoryAccessors) { for (auto accessor : kFactoryAccessors) {
// Ideal advanced is ignored by the SelectSettings algorithm. // Ideal advanced is ignored by the SelectSettings algorithm.
// Using kStringSetFunctions[1] instead of // Using array elements instead of pointer values due to the comparison
// static_cast<StringSetFunction>(&blink::StringConstraint::SetIdeal) // failing on some build configurations.
// because the equality comparison provides the wrong result in the
// Windows Debug build, making the test fail.
if (set_function == kStringSetFunctions[1] && if (set_function == kStringSetFunctions[1] &&
accessor == &MockConstraintFactory::AddAdvanced) { accessor == kFactoryAccessors[1]) {
continue; continue;
} }
ResetFactory(); ResetFactory();
...@@ -852,9 +864,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, InvalidGeometry) { ...@@ -852,9 +864,10 @@ TEST_P(MediaStreamConstraintsUtilAudioTest, InvalidGeometry) {
for (auto set_function : kStringSetFunctions) { for (auto set_function : kStringSetFunctions) {
for (auto accessor : kFactoryAccessors) { for (auto accessor : kFactoryAccessors) {
// Ideal advanced is ignored by the SelectSettings algorithm. // Ideal advanced is ignored by the SelectSettings algorithm.
if (set_function == static_cast<StringSetFunction>( // Using array elements instead of pointer values due to the comparison
&blink::StringConstraint::SetIdeal) && // failing on some build configurations.
accessor == &MockConstraintFactory::AddAdvanced) { if (set_function == kStringSetFunctions[1] &&
accessor == kFactoryAccessors[1]) {
continue; continue;
} }
ResetFactory(); ResetFactory();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment