generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a NULL session in unit tests that don't actually use the session.

Browse Source 
This is a part of the big BUNDLE implementation at https://webrtc-codereview.appspot.com/45519004/

R=decurtis@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/49379004

Cr-Commit-Position: refs/heads/master@{#8721}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8721 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pthatcher@webrtc.org 2015-03-13 20:05:17 +00:00
parent b4aac13810
commit b01c707209
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
talk/app/webrtc/statscollector_unittest.cc
View File

@ -790,7 +790,7 @@ TEST_F(StatsCollectorTest, BytesCounterHandles64Bits) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, kVideoChannelName, false, NULL); media_engine_, media_channel, NULL, kVideoChannelName, false, NULL);
StatsReports reports; // returned values. StatsReports reports; // returned values.
cricket::VideoSenderInfo video_sender_info; cricket::VideoSenderInfo video_sender_info;
cricket::VideoMediaInfo stats_read; cricket::VideoMediaInfo stats_read;
@ -833,7 +833,7 @@ TEST_F(StatsCollectorTest, BandwidthEstimationInfoIsReported) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, kVideoChannelName, false, NULL); media_engine_, media_channel, NULL, kVideoChannelName, false, NULL);
StatsReports reports; // returned values. StatsReports reports; // returned values.
cricket::VideoSenderInfo video_sender_info; cricket::VideoSenderInfo video_sender_info;
@ -912,7 +912,7 @@ TEST_F(StatsCollectorTest, TrackObjectExistsWithoutUpdateStats) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, "video", false, NULL); media_engine_, media_channel, NULL, "video", false, NULL);
AddOutgoingVideoTrackStats(); AddOutgoingVideoTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
@ -944,7 +944,7 @@ TEST_F(StatsCollectorTest, TrackAndSsrcObjectExistAfterUpdateSsrcStats) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, kVideoChannelName, false, NULL); media_engine_, media_channel, NULL, kVideoChannelName, false, NULL);
AddOutgoingVideoTrackStats(); AddOutgoingVideoTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
@ -1005,7 +1005,7 @@ TEST_F(StatsCollectorTest, TransportObjectLinkedFromSsrcObject) {
// The content_name known by the video channel. // The content_name known by the video channel.
const std::string kVcName("vcname"); const std::string kVcName("vcname");
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, kVcName, false, NULL); media_engine_, media_channel, NULL, kVcName, false, NULL);
AddOutgoingVideoTrackStats(); AddOutgoingVideoTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
@ -1063,7 +1063,7 @@ TEST_F(StatsCollectorTest, RemoteSsrcInfoIsAbsent) {
// The content_name known by the video channel. // The content_name known by the video channel.
const std::string kVcName("vcname"); const std::string kVcName("vcname");
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, kVcName, false, NULL); media_engine_, media_channel, NULL, kVcName, false, NULL);
AddOutgoingVideoTrackStats(); AddOutgoingVideoTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
@ -1090,7 +1090,7 @@ TEST_F(StatsCollectorTest, RemoteSsrcInfoIsPresent) {
// The content_name known by the video channel. // The content_name known by the video channel.
const std::string kVcName("vcname"); const std::string kVcName("vcname");
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, kVcName, false, NULL); media_engine_, media_channel, NULL, kVcName, false, NULL);
AddOutgoingVideoTrackStats(); AddOutgoingVideoTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
@ -1142,7 +1142,7 @@ TEST_F(StatsCollectorTest, ReportsFromRemoteTrack) {
MockVideoMediaChannel* media_channel = new MockVideoMediaChannel(); MockVideoMediaChannel* media_channel = new MockVideoMediaChannel();
cricket::VideoChannel video_channel(rtc::Thread::Current(), cricket::VideoChannel video_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, kVideoChannelName, false, NULL); media_engine_, media_channel, NULL, kVideoChannelName, false, NULL);
AddIncomingVideoTrackStats(); AddIncomingVideoTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
@ -1452,7 +1452,7 @@ TEST_F(StatsCollectorTest, GetStatsFromLocalAudioTrack) {
// The content_name known by the voice channel. // The content_name known by the voice channel.
const std::string kVcName("vcname"); const std::string kVcName("vcname");
cricket::VoiceChannel voice_channel(rtc::Thread::Current(), cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, kVcName, false); media_engine_, media_channel, NULL, kVcName, false);
AddOutgoingAudioTrackStats(); AddOutgoingAudioTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
stats.AddLocalAudioTrack(audio_track_, kSsrcOfTrack); stats.AddLocalAudioTrack(audio_track_, kSsrcOfTrack);
@ -1485,7 +1485,7 @@ TEST_F(StatsCollectorTest, GetStatsFromRemoteStream) {
// The content_name known by the voice channel. // The content_name known by the voice channel.
const std::string kVcName("vcname"); const std::string kVcName("vcname");
cricket::VoiceChannel voice_channel(rtc::Thread::Current(), cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, kVcName, false); media_engine_, media_channel, NULL, kVcName, false);
AddIncomingAudioTrackStats(); AddIncomingAudioTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
@ -1512,7 +1512,7 @@ TEST_F(StatsCollectorTest, GetStatsAfterRemoveAudioStream) {
// The content_name known by the voice channel. // The content_name known by the voice channel.
const std::string kVcName("vcname"); const std::string kVcName("vcname");
cricket::VoiceChannel voice_channel(rtc::Thread::Current(), cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, kVcName, false); media_engine_, media_channel, NULL, kVcName, false);
AddOutgoingAudioTrackStats(); AddOutgoingAudioTrackStats();
stats.AddStream(stream_); stats.AddStream(stream_);
stats.AddLocalAudioTrack(audio_track_.get(), kSsrcOfTrack); stats.AddLocalAudioTrack(audio_track_.get(), kSsrcOfTrack);
@ -1570,7 +1570,7 @@ TEST_F(StatsCollectorTest, LocalAndRemoteTracksWithSameSsrc) {
// The content_name known by the voice channel. // The content_name known by the voice channel.
const std::string kVcName("vcname"); const std::string kVcName("vcname");
cricket::VoiceChannel voice_channel(rtc::Thread::Current(), cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, kVcName, false); media_engine_, media_channel, NULL, kVcName, false);
// Create a local stream with a local audio track and adds it to the stats. // Create a local stream with a local audio track and adds it to the stats.
AddOutgoingAudioTrackStats(); AddOutgoingAudioTrackStats();
@ -1653,7 +1653,7 @@ TEST_F(StatsCollectorTest, TwoLocalTracksWithSameSsrc) {
// The content_name known by the voice channel. // The content_name known by the voice channel.
const std::string kVcName("vcname"); const std::string kVcName("vcname");
cricket::VoiceChannel voice_channel(rtc::Thread::Current(), cricket::VoiceChannel voice_channel(rtc::Thread::Current(),
media_engine_, media_channel, &session_, kVcName, false); media_engine_, media_channel, NULL, kVcName, false);
// Create a local stream with a local audio track and adds it to the stats. // Create a local stream with a local audio track and adds it to the stats.
AddOutgoingAudioTrackStats(); AddOutgoingAudioTrackStats();

8
talk/session/media/mediarecorder_unittest.cc
View File

@ -334,11 +334,9 @@ void TestRecordHeaderAndMedia(BaseChannel* channel,
TEST(MediaRecorderTest, TestMediaRecorderVoiceChannel) { TEST(MediaRecorderTest, TestMediaRecorderVoiceChannel) {
// Create the voice channel. // Create the voice channel.
FakeSession session(true);
FakeMediaEngine media_engine; FakeMediaEngine media_engine;
VoiceChannel channel(rtc::Thread::Current(), &media_engine, VoiceChannel channel(rtc::Thread::Current(), &media_engine,
new FakeVoiceMediaChannel(NULL), &session, "", false); new FakeVoiceMediaChannel(NULL), NULL, "", false);
EXPECT_TRUE(channel.Init());
TestMediaRecorder(&channel, NULL, PF_RTPPACKET); TestMediaRecorder(&channel, NULL, PF_RTPPACKET);
TestMediaRecorder(&channel, NULL, PF_RTPHEADER); TestMediaRecorder(&channel, NULL, PF_RTPHEADER);
TestRecordHeaderAndMedia(&channel, NULL); TestRecordHeaderAndMedia(&channel, NULL);
@ -346,12 +344,10 @@ TEST(MediaRecorderTest, TestMediaRecorderVoiceChannel) {
TEST(MediaRecorderTest, TestMediaRecorderVideoChannel) { TEST(MediaRecorderTest, TestMediaRecorderVideoChannel) {
// Create the video channel. // Create the video channel.
FakeSession session(true);
FakeMediaEngine media_engine; FakeMediaEngine media_engine;
FakeVideoMediaChannel* media_channel = new FakeVideoMediaChannel(NULL); FakeVideoMediaChannel* media_channel = new FakeVideoMediaChannel(NULL);
VideoChannel channel(rtc::Thread::Current(), &media_engine, VideoChannel channel(rtc::Thread::Current(), &media_engine,
media_channel, &session, "", false, NULL); media_channel, NULL, "", false, NULL);
EXPECT_TRUE(channel.Init());
TestMediaRecorder(&channel, media_channel, PF_RTPPACKET); TestMediaRecorder(&channel, media_channel, PF_RTPPACKET);
TestMediaRecorder(&channel, media_channel, PF_RTPHEADER); TestMediaRecorder(&channel, media_channel, PF_RTPHEADER);
TestRecordHeaderAndMedia(&channel, media_channel); TestRecordHeaderAndMedia(&channel, media_channel);