diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-05 14:24:17 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-05 14:24:17 +0000 |
| commit | 5cea89f3e1146327e2c5e8e39a68e51081f8f24c (patch) | |
| tree | 4feb8df9a97c2df01c18a715222f86008b88e1e2 | |
| parent | 0a3c1471b873ea7f81bff2faa7cf0d9e563c7d53 (diff) | |
| download | webrtc-5cea89f3e1146327e2c5e8e39a68e51081f8f24c.tar.gz | |
Remove CallTest dependency on voice_engine/test/.
Loading file out of resources/ instead of data/ which is deprecated.
BUG=
R=holmer@google.com, mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/5069004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5226 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | webrtc/video/call_tests.cc | 6 | ||||
| -rw-r--r-- | webrtc/video_engine_tests.isolate | 2 | ||||
| -rw-r--r-- | webrtc/webrtc_tests.gypi | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/webrtc/video/call_tests.cc b/webrtc/video/call_tests.cc index 67e01131a3..5649ad6eb6 100644 --- a/webrtc/video/call_tests.cc +++ b/webrtc/video/call_tests.cc @@ -31,13 +31,13 @@ #include "webrtc/voice_engine/include/voe_network.h" #include "webrtc/voice_engine/include/voe_rtp_rtcp.h" #include "webrtc/voice_engine/include/voe_video_sync.h" -#include "webrtc/voice_engine/test/auto_test/resource_manager.h" #include "webrtc/test/direct_transport.h" #include "webrtc/test/fake_audio_device.h" #include "webrtc/test/fake_decoder.h" #include "webrtc/test/fake_encoder.h" #include "webrtc/test/frame_generator_capturer.h" #include "webrtc/test/rtp_rtcp_observer.h" +#include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/perf_test.h" namespace webrtc { @@ -997,8 +997,8 @@ TEST_F(CallTest, PlaysOutAudioAndVideoInSync) { VoECodec* voe_codec = VoECodec::GetInterface(voice_engine); VoENetwork* voe_network = VoENetwork::GetInterface(voice_engine); VoEVideoSync* voe_sync = VoEVideoSync::GetInterface(voice_engine); - ResourceManager resource_manager; - const std::string audio_filename = resource_manager.long_audio_file_path(); + const std::string audio_filename = + test::ResourcePath("voice_engine/audio_long16", "pcm"); ASSERT_STRNE("", audio_filename.c_str()); test::FakeAudioDevice fake_audio_device(Clock::GetRealTimeClock(), audio_filename); diff --git a/webrtc/video_engine_tests.isolate b/webrtc/video_engine_tests.isolate index af98afd489..4108041dcb 100644 --- a/webrtc/video_engine_tests.isolate +++ b/webrtc/video_engine_tests.isolate @@ -26,9 +26,9 @@ ], 'isolate_dependency_tracked': [ '../DEPS', - '../data/voice_engine/audio_long16.pcm', '../resources/foreman_cif.yuv', '../resources/paris_qcif.yuv', + '../resources/voice_engine/audio_long16.pcm', '../testing/test_env.py', '<(PRODUCT_DIR)/video_engine_tests<(EXECUTABLE_SUFFIX)', ], diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index 6827fd5dd8..69a5a7ba79 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -36,8 +36,6 @@ 'video/full_stack.cc', 'video/rampup_tests.cc', 'video/video_send_stream_tests.cc', - 'voice_engine/test/auto_test/resource_manager.cc', - 'voice_engine/test/auto_test/resource_manager.h', 'test/common_unittest.cc', 'test/test_main.cc', ], |