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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/pc/srtpfilter_unittest.cc

Issue 2938013003: Delete SignalSrtpError. (Closed)
Patch Set: Delete left-over declaration of set_signal_silent_time. Created 3 years, 6 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 side-by-side diff with in-line comments
Download patch
« webrtc/base/sigslotrepeater.h ('K') | « webrtc/pc/srtpfilter.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/srtpfilter_unittest.cc
diff --git a/webrtc/pc/srtpfilter_unittest.cc b/webrtc/pc/srtpfilter_unittest.cc
index af8b69f73e334496ef4e2bc80224a66ecd85d6f8..ec79b90aa1ec2f99d05a4ed5a397010af89d63e9 100644
--- a/webrtc/pc/srtpfilter_unittest.cc
+++ b/webrtc/pc/srtpfilter_unittest.cc
@@ -841,172 +841,3 @@ TEST_F(SrtpSessionTest, TestReplay) {
EXPECT_TRUE(s1_.ProtectRtp(rtp_packet_, rtp_len_, sizeof(rtp_packet_),
&out_len));
}
-
-class SrtpStatTest
- : public testing::Test,
- public sigslot::has_slots<> {
- public:
- SrtpStatTest()
- : ssrc_(0U),
- mode_(-1),
- error_(cricket::SrtpFilter::ERROR_NONE) {
- srtp_stat_.SignalSrtpError.connect(this, &SrtpStatTest::OnSrtpError);
- srtp_stat_.set_signal_silent_time(200);
- }
-
- protected:
- void OnSrtpError(uint32_t ssrc,
- cricket::SrtpFilter::Mode mode,
- cricket::SrtpFilter::Error error) {
- ssrc_ = ssrc;
- mode_ = mode;
- error_ = error;
- }
- void Reset() {
- ssrc_ = 0U;
- mode_ = -1;
- error_ = cricket::SrtpFilter::ERROR_NONE;
- }
-
- cricket::SrtpStat srtp_stat_;
- uint32_t ssrc_;
- int mode_;
- cricket::SrtpFilter::Error error_;
-
- private:
- RTC_DISALLOW_COPY_AND_ASSIGN(SrtpStatTest);
-};
-
-TEST_F(SrtpStatTest, TestProtectRtpError) {
- Reset();
- srtp_stat_.AddProtectRtpResult(1, srtp_err_status_ok);
- EXPECT_EQ(0U, ssrc_);
- EXPECT_EQ(-1, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_NONE, error_);
- Reset();
- srtp_stat_.AddProtectRtpResult(1, srtp_err_status_auth_fail);
- EXPECT_EQ(1U, ssrc_);
- EXPECT_EQ(cricket::SrtpFilter::PROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_AUTH, error_);
- Reset();
- srtp_stat_.AddProtectRtpResult(1, srtp_err_status_fail);
- EXPECT_EQ(1U, ssrc_);
- EXPECT_EQ(cricket::SrtpFilter::PROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_FAIL, error_);
- // Within 200ms, the error will not be triggered.
- Reset();
- srtp_stat_.AddProtectRtpResult(1, srtp_err_status_fail);
- EXPECT_EQ(0U, ssrc_);
- EXPECT_EQ(-1, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_NONE, error_);
- // Now the error will be triggered again.
- Reset();
- rtc::Thread::Current()->SleepMs(210);
- srtp_stat_.AddProtectRtpResult(1, srtp_err_status_fail);
- EXPECT_EQ(1U, ssrc_);
- EXPECT_EQ(cricket::SrtpFilter::PROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_FAIL, error_);
-}
-
-TEST_F(SrtpStatTest, TestUnprotectRtpError) {
- Reset();
- srtp_stat_.AddUnprotectRtpResult(1, srtp_err_status_ok);
- EXPECT_EQ(0U, ssrc_);
- EXPECT_EQ(-1, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_NONE, error_);
- Reset();
- srtp_stat_.AddUnprotectRtpResult(1, srtp_err_status_auth_fail);
- EXPECT_EQ(1U, ssrc_);
- EXPECT_EQ(cricket::SrtpFilter::UNPROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_AUTH, error_);
- Reset();
- srtp_stat_.AddUnprotectRtpResult(1, srtp_err_status_replay_fail);
- EXPECT_EQ(1U, ssrc_);
- EXPECT_EQ(cricket::SrtpFilter::UNPROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_REPLAY, error_);
- Reset();
- rtc::Thread::Current()->SleepMs(210);
- srtp_stat_.AddUnprotectRtpResult(1, srtp_err_status_replay_old);
- EXPECT_EQ(1U, ssrc_);
- EXPECT_EQ(cricket::SrtpFilter::UNPROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_REPLAY, error_);
- Reset();
- srtp_stat_.AddUnprotectRtpResult(1, srtp_err_status_fail);
- EXPECT_EQ(1U, ssrc_);
- EXPECT_EQ(cricket::SrtpFilter::UNPROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_FAIL, error_);
- // Within 200ms, the error will not be triggered.
- Reset();
- srtp_stat_.AddUnprotectRtpResult(1, srtp_err_status_fail);
- EXPECT_EQ(0U, ssrc_);
- EXPECT_EQ(-1, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_NONE, error_);
- // Now the error will be triggered again.
- Reset();
- rtc::Thread::Current()->SleepMs(210);
- srtp_stat_.AddUnprotectRtpResult(1, srtp_err_status_fail);
- EXPECT_EQ(1U, ssrc_);
- EXPECT_EQ(cricket::SrtpFilter::UNPROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_FAIL, error_);
-}
-
-TEST_F(SrtpStatTest, TestProtectRtcpError) {
- Reset();
- srtp_stat_.AddProtectRtcpResult(srtp_err_status_ok);
- EXPECT_EQ(-1, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_NONE, error_);
- Reset();
- srtp_stat_.AddProtectRtcpResult(srtp_err_status_auth_fail);
- EXPECT_EQ(cricket::SrtpFilter::PROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_AUTH, error_);
- Reset();
- srtp_stat_.AddProtectRtcpResult(srtp_err_status_fail);
- EXPECT_EQ(cricket::SrtpFilter::PROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_FAIL, error_);
- // Within 200ms, the error will not be triggered.
- Reset();
- srtp_stat_.AddProtectRtcpResult(srtp_err_status_fail);
- EXPECT_EQ(-1, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_NONE, error_);
- // Now the error will be triggered again.
- Reset();
- rtc::Thread::Current()->SleepMs(210);
- srtp_stat_.AddProtectRtcpResult(srtp_err_status_fail);
- EXPECT_EQ(cricket::SrtpFilter::PROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_FAIL, error_);
-}
-
-TEST_F(SrtpStatTest, TestUnprotectRtcpError) {
- Reset();
- srtp_stat_.AddUnprotectRtcpResult(srtp_err_status_ok);
- EXPECT_EQ(-1, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_NONE, error_);
- Reset();
- srtp_stat_.AddUnprotectRtcpResult(srtp_err_status_auth_fail);
- EXPECT_EQ(cricket::SrtpFilter::UNPROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_AUTH, error_);
- Reset();
- srtp_stat_.AddUnprotectRtcpResult(srtp_err_status_replay_fail);
- EXPECT_EQ(cricket::SrtpFilter::UNPROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_REPLAY, error_);
- Reset();
- rtc::Thread::Current()->SleepMs(210);
- srtp_stat_.AddUnprotectRtcpResult(srtp_err_status_replay_fail);
- EXPECT_EQ(cricket::SrtpFilter::UNPROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_REPLAY, error_);
- Reset();
- srtp_stat_.AddUnprotectRtcpResult(srtp_err_status_fail);
- EXPECT_EQ(cricket::SrtpFilter::UNPROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_FAIL, error_);
- // Within 200ms, the error will not be triggered.
- Reset();
- srtp_stat_.AddUnprotectRtcpResult(srtp_err_status_fail);
- EXPECT_EQ(-1, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_NONE, error_);
- // Now the error will be triggered again.
- Reset();
- rtc::Thread::Current()->SleepMs(210);
- srtp_stat_.AddUnprotectRtcpResult(srtp_err_status_fail);
- EXPECT_EQ(cricket::SrtpFilter::UNPROTECT, mode_);
- EXPECT_EQ(cricket::SrtpFilter::ERROR_FAIL, error_);
-}
« webrtc/base/sigslotrepeater.h ('K') | « webrtc/pc/srtpfilter.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698