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

Side by Side Diff: content/renderer/media/rtc_peer_connection_handler_unittest.cc

Issue 468393003: Add the addIceCandidate failure case to webrtc-internals. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « content/renderer/media/rtc_peer_connection_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 const RTCMediaConstraints& constraints)); 138 const RTCMediaConstraints& constraints));
139 MOCK_METHOD3(TrackSetSessionDescription, 139 MOCK_METHOD3(TrackSetSessionDescription,
140 void(RTCPeerConnectionHandler* pc_handler, 140 void(RTCPeerConnectionHandler* pc_handler,
141 const blink::WebRTCSessionDescription& desc, 141 const blink::WebRTCSessionDescription& desc,
142 Source source)); 142 Source source));
143 MOCK_METHOD3( 143 MOCK_METHOD3(
144 TrackUpdateIce, 144 TrackUpdateIce,
145 void(RTCPeerConnectionHandler* pc_handler, 145 void(RTCPeerConnectionHandler* pc_handler,
146 const webrtc::PeerConnectionInterface::RTCConfiguration& config, 146 const webrtc::PeerConnectionInterface::RTCConfiguration& config,
147 const RTCMediaConstraints& options)); 147 const RTCMediaConstraints& options));
148 MOCK_METHOD3(TrackAddIceCandidate, 148 MOCK_METHOD4(TrackAddIceCandidate,
149 void(RTCPeerConnectionHandler* pc_handler, 149 void(RTCPeerConnectionHandler* pc_handler,
150 const blink::WebRTCICECandidate& candidate, 150 const blink::WebRTCICECandidate& candidate,
151 Source source)); 151 Source source,
152 bool succeeded));
152 MOCK_METHOD3(TrackAddStream, 153 MOCK_METHOD3(TrackAddStream,
153 void(RTCPeerConnectionHandler* pc_handler, 154 void(RTCPeerConnectionHandler* pc_handler,
154 const blink::WebMediaStream& stream, 155 const blink::WebMediaStream& stream,
155 Source source)); 156 Source source));
156 MOCK_METHOD3(TrackRemoveStream, 157 MOCK_METHOD3(TrackRemoveStream,
157 void(RTCPeerConnectionHandler* pc_handler, 158 void(RTCPeerConnectionHandler* pc_handler,
158 const blink::WebMediaStream& stream, 159 const blink::WebMediaStream& stream,
159 Source source)); 160 Source source));
160 MOCK_METHOD1(TrackOnIceComplete, 161 MOCK_METHOD1(TrackOnIceComplete,
161 void(RTCPeerConnectionHandler* pc_handler)); 162 void(RTCPeerConnectionHandler* pc_handler));
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 382
382 EXPECT_CALL(*mock_tracker_.get(), TrackUpdateIce(pc_handler_.get(), _, _)); 383 EXPECT_CALL(*mock_tracker_.get(), TrackUpdateIce(pc_handler_.get(), _, _));
383 // TODO(perkj): Test that the parameters in |config| can be translated when a 384 // TODO(perkj): Test that the parameters in |config| can be translated when a
384 // WebRTCConfiguration can be constructed. It's WebKit class and can't be 385 // WebRTCConfiguration can be constructed. It's WebKit class and can't be
385 // initialized from a test. 386 // initialized from a test.
386 EXPECT_TRUE(pc_handler_->updateICE(config, constraints)); 387 EXPECT_TRUE(pc_handler_->updateICE(config, constraints));
387 } 388 }
388 389
389 TEST_F(RTCPeerConnectionHandlerTest, addICECandidate) { 390 TEST_F(RTCPeerConnectionHandlerTest, addICECandidate) {
390 blink::WebRTCICECandidate candidate; 391 blink::WebRTCICECandidate candidate;
391 candidate.initialize(kDummySdp, "mid", 1); 392 candidate.initialize(kDummySdp, "sdpMid", 1);
392 393
393 EXPECT_CALL(*mock_tracker_.get(), 394 EXPECT_CALL(*mock_tracker_.get(),
394 TrackAddIceCandidate(pc_handler_.get(), 395 TrackAddIceCandidate(pc_handler_.get(),
395 testing::Ref(candidate), 396 testing::Ref(candidate),
396 PeerConnectionTracker::SOURCE_REMOTE)); 397 PeerConnectionTracker::SOURCE_REMOTE,
398 true));
397 EXPECT_TRUE(pc_handler_->addICECandidate(candidate)); 399 EXPECT_TRUE(pc_handler_->addICECandidate(candidate));
398 EXPECT_EQ(kDummySdp, mock_peer_connection_->ice_sdp()); 400 EXPECT_EQ(kDummySdp, mock_peer_connection_->ice_sdp());
399 EXPECT_EQ(1, mock_peer_connection_->sdp_mline_index()); 401 EXPECT_EQ(1, mock_peer_connection_->sdp_mline_index());
400 EXPECT_EQ("mid", mock_peer_connection_->sdp_mid()); 402 EXPECT_EQ("sdpMid", mock_peer_connection_->sdp_mid());
401 } 403 }
402 404
403 TEST_F(RTCPeerConnectionHandlerTest, addAndRemoveStream) { 405 TEST_F(RTCPeerConnectionHandlerTest, addAndRemoveStream) {
404 std::string stream_label = "local_stream"; 406 std::string stream_label = "local_stream";
405 blink::WebMediaStream local_stream( 407 blink::WebMediaStream local_stream(
406 CreateLocalMediaStream(stream_label)); 408 CreateLocalMediaStream(stream_label));
407 blink::WebMediaConstraints constraints; 409 blink::WebMediaConstraints constraints;
408 410
409 EXPECT_CALL(*mock_tracker_.get(), 411 EXPECT_CALL(*mock_tracker_.get(),
410 TrackAddStream(pc_handler_.get(), 412 TrackAddStream(pc_handler_.get(),
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
800 remote_stream->AddTrack(webrtc_track.get()); 802 remote_stream->AddTrack(webrtc_track.get());
801 blink::WebVector<blink::WebMediaStreamTrack> modified_video_tracks2; 803 blink::WebVector<blink::WebMediaStreamTrack> modified_video_tracks2;
802 webkit_stream.videoTracks(modified_video_tracks2); 804 webkit_stream.videoTracks(modified_video_tracks2);
803 EXPECT_EQ(1u, modified_video_tracks2.size()); 805 EXPECT_EQ(1u, modified_video_tracks2.size());
804 } 806 }
805 807
806 TEST_F(RTCPeerConnectionHandlerTest, OnIceCandidate) { 808 TEST_F(RTCPeerConnectionHandlerTest, OnIceCandidate) {
807 testing::InSequence sequence; 809 testing::InSequence sequence;
808 EXPECT_CALL(*mock_tracker_.get(), 810 EXPECT_CALL(*mock_tracker_.get(),
809 TrackAddIceCandidate(pc_handler_.get(), _, 811 TrackAddIceCandidate(pc_handler_.get(), _,
810 PeerConnectionTracker::SOURCE_LOCAL)); 812 PeerConnectionTracker::SOURCE_LOCAL, true));
811 EXPECT_CALL(*mock_client_.get(), didGenerateICECandidate(_)); 813 EXPECT_CALL(*mock_client_.get(), didGenerateICECandidate(_));
812 814
813 scoped_ptr<webrtc::IceCandidateInterface> native_candidate( 815 scoped_ptr<webrtc::IceCandidateInterface> native_candidate(
814 mock_dependency_factory_->CreateIceCandidate("mid", 1, kDummySdp)); 816 mock_dependency_factory_->CreateIceCandidate("sdpMid", 1, kDummySdp));
815 pc_handler_->OnIceCandidate(native_candidate.get()); 817 pc_handler_->OnIceCandidate(native_candidate.get());
816 EXPECT_EQ("mid", mock_client_->candidate_mid()); 818 EXPECT_EQ("sdpMid", mock_client_->candidate_mid());
817 EXPECT_EQ(1, mock_client_->candidate_mlineindex()); 819 EXPECT_EQ(1, mock_client_->candidate_mlineindex());
818 EXPECT_EQ(kDummySdp, mock_client_->candidate_sdp()); 820 EXPECT_EQ(kDummySdp, mock_client_->candidate_sdp());
819 } 821 }
820 822
821 TEST_F(RTCPeerConnectionHandlerTest, OnRenegotiationNeeded) { 823 TEST_F(RTCPeerConnectionHandlerTest, OnRenegotiationNeeded) {
822 testing::InSequence sequence; 824 testing::InSequence sequence;
823 EXPECT_CALL(*mock_tracker_.get(), 825 EXPECT_CALL(*mock_tracker_.get(),
824 TrackOnRenegotiationNeeded(pc_handler_.get())); 826 TrackOnRenegotiationNeeded(pc_handler_.get()));
825 EXPECT_CALL(*mock_client_.get(), negotiationNeeded()); 827 EXPECT_CALL(*mock_client_.get(), negotiationNeeded());
826 pc_handler_->OnRenegotiationNeeded(); 828 pc_handler_->OnRenegotiationNeeded();
(...skipping 29 matching lines...) Expand all
856 EXPECT_CALL(*mock_tracker_.get(), 858 EXPECT_CALL(*mock_tracker_.get(),
857 TrackCreateDTMFSender(pc_handler_.get(), 859 TrackCreateDTMFSender(pc_handler_.get(),
858 testing::Ref(tracks[0]))); 860 testing::Ref(tracks[0])));
859 861
860 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender( 862 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender(
861 pc_handler_->createDTMFSender(tracks[0])); 863 pc_handler_->createDTMFSender(tracks[0]));
862 EXPECT_TRUE(sender.get()); 864 EXPECT_TRUE(sender.get());
863 } 865 }
864 866
865 } // namespace content 867 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_peer_connection_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698