diff --git a/webrtc/modules/video_coding/sequence_number_util_unittest.cc b/webrtc/modules/video_coding/sequence_number_util_unittest.cc index 6988b3e827..e0db1a8a5f 100644 --- a/webrtc/modules/video_coding/sequence_number_util_unittest.cc +++ b/webrtc/modules/video_coding/sequence_number_util_unittest.cc @@ -209,25 +209,27 @@ TEST_F(TestSeqNumUtil, SeqNumComparatorWithDivisor) { } } -// TODO(philipel): Enable when downstream project can hande these death tests. - -TEST(SeqNumUnwrapper, DISABLED_NoBackWardWrap) { +#if GTEST_HAS_DEATH_TEST +#if !defined(WEBRTC_ANDROID) +TEST(SeqNumUnwrapper, NoBackWardWrap) { SeqNumUnwrapper unwrapper; EXPECT_EQ(0U, unwrapper.Unwrap(0)); // The unwrapped sequence is not allowed to wrap, if that happens the // SeqNumUnwrapper should have been constructed with a higher start value. - ASSERT_DEATH_IF_SUPPORTED(unwrapper.Unwrap(255), ""); + EXPECT_DEATH(unwrapper.Unwrap(255), ""); } -TEST(SeqNumUnwrapper, DISABLED_NoForwardWrap) { +TEST(SeqNumUnwrapper, NoForwardWrap) { SeqNumUnwrapper unwrapper(std::numeric_limits::max()); EXPECT_EQ(std::numeric_limits::max(), unwrapper.Unwrap(0)); // The unwrapped sequence is not allowed to wrap, if that happens the // SeqNumUnwrapper should have been constructed with a lower start value. - ASSERT_DEATH_IF_SUPPORTED(unwrapper.Unwrap(1), ""); + EXPECT_DEATH(unwrapper.Unwrap(1), ""); } +#endif +#endif TEST(SeqNumUnwrapper, ForwardWrap) { SeqNumUnwrapper unwrapper;