From 679f1cb90c7a442fe231ce8d930fe76e15bb0f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Tue, 21 Dec 2021 15:45:30 +0100 Subject: [PATCH] Move tests of legacy video code to its own target. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To ensure that tests of non-legacy code doesn't depend on legacy classes and headers. Bug: None Change-Id: Ief63fd77e412892b6f0923530d2317bde4937585 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/242364 Reviewed-by: Mirko Bonadei Reviewed-by: Erik Språng Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/main@{#35569} --- BUILD.gn | 1 + video/BUILD.gn | 37 +++++++++++++++++-- video/call_stats2_unittest.cc | 1 + video/rtp_video_stream_receiver2_unittest.cc | 1 - ...ver_frame_transformer_delegate_unittest.cc | 1 - video/video_receive_stream2_unittest.cc | 1 - 6 files changed, 35 insertions(+), 7 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index e6255dcef7..3d4fedfb01 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -625,6 +625,7 @@ if (rtc_include_tests && !build_with_chromium) { "test:test_common", "test:test_main", "test:video_test_common", + "video:video_legacy_tests", "video:video_tests", "video/adaptation:video_adaptation_tests", ] diff --git a/video/BUILD.gn b/video/BUILD.gn index b504d3dea6..82a653a508 100644 --- a/video/BUILD.gn +++ b/video/BUILD.gn @@ -618,7 +618,6 @@ if (rtc_include_tests) { "alignment_adjuster_unittest.cc", "buffered_frame_decryptor_unittest.cc", "call_stats2_unittest.cc", - "call_stats_unittest.cc", "cpu_scaling_tests.cc", "encoder_bitrate_adjuster_unittest.cc", "encoder_overshoot_detector_unittest.cc", @@ -649,11 +648,9 @@ if (rtc_include_tests) { "quality_scaling_tests.cc", "quality_threshold_unittest.cc", "receive_statistics_proxy2_unittest.cc", - "receive_statistics_proxy_unittest.cc", "report_block_stats_unittest.cc", "rtp_video_stream_receiver2_unittest.cc", "rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc", - "rtp_video_stream_receiver_unittest.cc", "send_delay_stats_unittest.cc", "send_statistics_proxy_unittest.cc", "stats_counter_unittest.cc", @@ -668,7 +665,6 @@ if (rtc_include_tests) { deps = [ ":frame_cadence_adapter", ":video", - ":video_legacy", ":video_mocks", ":video_stream_decoder_impl", ":video_stream_encoder_impl", @@ -787,4 +783,37 @@ if (rtc_include_tests) { deps += [ "../media:rtc_media_base" ] } } + rtc_library("video_legacy_tests") { + testonly = true + sources = [ + "call_stats_unittest.cc", + "receive_statistics_proxy_unittest.cc", + "rtp_video_stream_receiver_unittest.cc", + ] + deps = [ + ":video_legacy", + "../api:scoped_refptr", + "../api/video:video_frame", + "../api/video:video_frame_type", + "../api/video:video_rtp_headers", + "../call:mock_rtp_interfaces", + "../common_video", + "../media:rtc_media_base", + "../modules/rtp_rtcp", + "../modules/rtp_rtcp:rtp_rtcp_format", + "../modules/utility", + "../modules/video_coding", + "../modules/video_coding:video_codec_interface", + "../rtc_base:rtc_base_approved", + "../rtc_base/task_utils:to_queued_task", + "../system_wrappers", + "../system_wrappers:field_trial", + "../system_wrappers:metrics", + "../test:field_trial", + "../test:mock_frame_transformer", + "../test:mock_transport", + "../test:test_support", + ] + absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ] + } } diff --git a/video/call_stats2_unittest.cc b/video/call_stats2_unittest.cc index 33235faeaa..65264926e4 100644 --- a/video/call_stats2_unittest.cc +++ b/video/call_stats2_unittest.cc @@ -60,6 +60,7 @@ class CallStats2Test : public ::testing::Test { } test::RunLoop loop_; + // TODO(nisse): Don't use process thread. std::unique_ptr process_thread_{ ProcessThread::Create("CallStats")}; // Note: Since rtc::Thread doesn't support injecting a Clock, we're going diff --git a/video/rtp_video_stream_receiver2_unittest.cc b/video/rtp_video_stream_receiver2_unittest.cc index b92a553cd5..cf033ef8a2 100644 --- a/video/rtp_video_stream_receiver2_unittest.cc +++ b/video/rtp_video_stream_receiver2_unittest.cc @@ -27,7 +27,6 @@ #include "modules/rtp_rtcp/source/rtp_header_extensions.h" #include "modules/rtp_rtcp/source/rtp_packet_received.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "modules/utility/include/process_thread.h" #include "modules/video_coding/frame_object.h" #include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/rtp_frame_reference_finder.h" diff --git a/video/rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc b/video/rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc index 0d85cc08e2..c3b2ece9cc 100644 --- a/video/rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc +++ b/video/rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc @@ -19,7 +19,6 @@ #include "api/call/transport.h" #include "call/video_receive_stream.h" #include "modules/rtp_rtcp/source/rtp_descriptor_authentication.h" -#include "modules/utility/include/process_thread.h" #include "rtc_base/event.h" #include "rtc_base/ref_counted_object.h" #include "rtc_base/task_utils/to_queued_task.h" diff --git a/video/video_receive_stream2_unittest.cc b/video/video_receive_stream2_unittest.cc index 8004bc375b..223523ce7a 100644 --- a/video/video_receive_stream2_unittest.cc +++ b/video/video_receive_stream2_unittest.cc @@ -28,7 +28,6 @@ #include "media/engine/fake_webrtc_call.h" #include "modules/pacing/packet_router.h" #include "modules/rtp_rtcp/source/rtp_packet_to_send.h" -#include "modules/utility/include/process_thread.h" #include "modules/video_coding/encoded_frame.h" #include "rtc_base/event.h" #include "system_wrappers/include/clock.h"