| 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..0d0377bb2fc664774a648fa75b2f376dcf0b0c0b 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_TRUE(channel_proxy_->SendTelephoneEventOutband(i, 160));
|
| 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_TRUE(channel_proxy_->SendTelephoneEventOutband(32, 160));
|
| + EXPECT_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_TRUE(
|
| + channel_proxy_->SetSendTelephoneEventPayloadType(codec_instance.pltype));
|
|
|
| - EXPECT_EQ(0, voe_dtmf_->SetDtmfFeedbackStatus(true, false));
|
| + RunSixteenDtmfEvents();
|
| }
|
|
|