Index: webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc |
diff --git a/webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc b/webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc |
index 18faa971c588e9831a77b503652a40b792826e13..e549f8721d58d1cec3f71d6a43cf5321b4d6e5a2 100644 |
--- a/webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc |
+++ b/webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc |
@@ -13,43 +13,25 @@ |
class DtmfTest : public AfterStreamingFixture { |
protected: |
- void RunSixteenDtmfEvents(bool out_of_band) { |
+ void RunSixteenDtmfEvents() { |
TEST_LOG("Sending telephone events:\n"); |
- EXPECT_EQ(0, voe_dtmf_->SetDtmfFeedbackStatus(false)); |
- |
for (int i = 0; i < 16; i++) { |
TEST_LOG("%d ", i); |
TEST_LOG_FLUSH; |
- EXPECT_EQ(0, voe_dtmf_->SendTelephoneEvent( |
- channel_, i, out_of_band, 160, 10)); |
+ EXPECT_EQ(true, channel_proxy_->SendTelephoneEventOutband(i, 160)); |
hlundin-webrtc
2016/03/07 15:59:23
EXPECT_TRUE? Here and below.
the sun
2016/03/07 16:11:35
Done.
|
Sleep(500); |
} |
TEST_LOG("\n"); |
} |
}; |
-TEST_F(DtmfTest, DtmfFeedbackIsEnabledByDefaultButNotDirectFeedback) { |
- bool dtmf_feedback = false; |
- bool dtmf_direct_feedback = false; |
- |
- EXPECT_EQ(0, voe_dtmf_->GetDtmfFeedbackStatus(dtmf_feedback, |
- dtmf_direct_feedback)); |
- |
- EXPECT_TRUE(dtmf_feedback); |
- EXPECT_FALSE(dtmf_direct_feedback); |
-} |
- |
-TEST_F(DtmfTest, ManualSuccessfullySendsInBandTelephoneEvents) { |
- RunSixteenDtmfEvents(false); |
-} |
- |
TEST_F(DtmfTest, ManualSuccessfullySendsOutOfBandTelephoneEvents) { |
- RunSixteenDtmfEvents(true); |
+ RunSixteenDtmfEvents(); |
} |
TEST_F(DtmfTest, TestTwoNonDtmfEvents) { |
- EXPECT_EQ(0, voe_dtmf_->SendTelephoneEvent(channel_, 32, true)); |
- EXPECT_EQ(0, voe_dtmf_->SendTelephoneEvent(channel_, 110, true)); |
+ EXPECT_EQ(true, channel_proxy_->SendTelephoneEventOutband(32, 160)); |
+ EXPECT_EQ(true, channel_proxy_->SendTelephoneEventOutband(110, 160)); |
} |
// This test modifies the DTMF payload type from the default 106 to 88 |
@@ -78,10 +60,8 @@ TEST_F(DtmfTest, ManualCanChangeDtmfPayloadType) { |
Sleep(500); |
// Next, we must modify the sending side as well. |
- EXPECT_EQ(0, voe_dtmf_->SetSendTelephoneEventPayloadType( |
- channel_, codec_instance.pltype)); |
- |
- RunSixteenDtmfEvents(true); |
+ EXPECT_EQ(true, |
+ channel_proxy_->SetSendTelephoneEventPayloadType(codec_instance.pltype)); |
- EXPECT_EQ(0, voe_dtmf_->SetDtmfFeedbackStatus(true, false)); |
+ RunSixteenDtmfEvents(); |
} |