commit 3adf058e962fa6f313d0fa4e6b8981407369924d
author pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Dec 05 14:24:17 2013
committer pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Dec 05 14:24:17 2013
tree 3b01790a28f8e398afd9a53446d482fe4633bde5
parent ee234be7908840221b78e6489d42ea792d4ce87d

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/webrtc@5226 4adac7df-926f-26a2-2b94-8c16560cd09d

video/call_tests.cc

diff --git a/video/call_tests.cc b/video/call_tests.cc
index 67e0113..5649ad6 100644
--- a/video/call_tests.cc
+++ b/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 @@
   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);

video_engine_tests.isolate

diff --git a/video_engine_tests.isolate b/video_engine_tests.isolate
index af98afd..4108041 100644
--- a/video_engine_tests.isolate
+++ b/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)',
         ],

webrtc_tests.gypi

diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi
index 6827fd5..69a5a7b 100644
--- a/webrtc_tests.gypi
+++ b/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',
       ],