Converted to gtest, writing output files properly and no longer uses exceptions.
This test now runs and fails as a gtest should (previously it always
exited with 0 even if the tests failed).
The audio_coding_module_test target no longer uses exceptions in the generated project.
Output files are written to our global output folder, using
testsupport/fileutils.h.
BUG=
TEST=audio_coding_module_test on all platforms, in Debug+Release
Review URL: http://webrtc-codereview.appspot.com/334004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@1266 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/src/modules/audio_coding/main/test/iSACTest.cpp b/src/modules/audio_coding/main/test/iSACTest.cpp
index bd066aa..966c4c5 100644
--- a/src/modules/audio_coding/main/test/iSACTest.cpp
+++ b/src/modules/audio_coding/main/test/iSACTest.cpp
@@ -25,7 +25,7 @@
#include "iSACTest.h"
#include "utility.h"
#include "trace.h"
-
+#include "testsupport/fileutils.h"
#include "tick_util.h"
namespace webrtc {
@@ -200,20 +200,10 @@
}
_inFileA.Open(_fileNameSWB, 32000, "rb");
- if(_testMode == 0)
- {
- char fileNameA[] = "./src/modules/audio_coding/main/test/testisac_a.pcm";
- char fileNameB[] = "./src/modules/audio_coding/main/test/testisac_b.pcm";
- _outFileA.Open(fileNameA, 32000, "wb");
- _outFileB.Open(fileNameB, 32000, "wb");
- }
- else
- {
- char fileNameA[] = "./src/modules/audio_coding/main/test/testisac_a.pcm";
- char fileNameB[] = "./src/modules/audio_coding/main/test/testisac_b.pcm";
- _outFileA.Open(fileNameA, 32000, "wb");
- _outFileB.Open(fileNameB, 32000, "wb");
- }
+ std::string fileNameA = webrtc::test::OutputPath() + "testisac_a.pcm";
+ std::string fileNameB = webrtc::test::OutputPath() + "testisac_b.pcm";
+ _outFileA.Open(fileNameA.c_str(), 32000, "wb");
+ _outFileB.Open(fileNameB.c_str(), 32000, "wb");
while(!_inFileA.EndOfFile())
{
@@ -395,14 +385,16 @@
if(_testMode == 0)
{
sprintf(fileNameOut,
- "./src/modules/audio_coding/main/test/out_iSACTest_%s_%02d.pcm",
+ "%s/out_iSACTest_%s_%02d.pcm",
+ webrtc::test::OutputPath().c_str(),
"A",
testNr);
}
else
{
sprintf(fileNameOut,
- "./src/modules/audio_coding/main/test/out%s_%02d.pcm",
+ "%s/out%s_%02d.pcm",
+ webrtc::test::OutputPath().c_str(),
"A",
testNr);
}
@@ -413,14 +405,16 @@
if(_testMode == 0)
{
sprintf(fileNameOut,
- "./src/modules/audio_coding/main/test/out_iSACTest_%s_%02d.pcm",
+ "%s/out_iSACTest_%s_%02d.pcm",
+ webrtc::test::OutputPath().c_str(),
"B",
testNr);
}
else
{
sprintf(fileNameOut,
- "./src/modules/audio_coding/main/test/out%s_%02d.pcm",
+ "%s/out%s_%02d.pcm",
+ webrtc::test::OutputPath().c_str(),
"B",
testNr);
}
@@ -504,7 +498,8 @@
if(_testMode == 0)
{
sprintf(fileNameOut,
- "./src/modules/audio_coding/main/test/out_iSACTest_%s_%02d.pcm",
+ "%s/out_iSACTest_%s_%02d.pcm",
+ webrtc::test::OutputPath().c_str(),
"A",
testNr);
}
@@ -513,7 +508,8 @@
printf("\nTest %d", testNr);
printf(" Alternate between WB and SWB at the sender Side\n\n");
sprintf(fileNameOut,
- "./src/modules/audio_coding/main/test/out%s_%02d.pcm",
+ "%s/out%s_%02d.pcm",
+ webrtc::test::OutputPath().c_str(),
"A",
testNr);
}
@@ -524,13 +520,15 @@
if(_testMode == 0)
{
sprintf(fileNameOut,
- "./src/modules/audio_coding/main/test/out_iSACTest_%s_%02d.pcm",
+ "%s/out_iSACTest_%s_%02d.pcm",
+ webrtc::test::OutputPath().c_str(),
"B",
testNr);
}
else
{
- sprintf(fileNameOut, "./src/modules/audio_coding/main/test/out%s_%02d.pcm",
+ sprintf(fileNameOut, "%s/out%s_%02d.pcm",
+ webrtc::test::OutputPath().c_str(),
"B",
testNr);
}