commit adaf80961280dfecd3fdcc23bd3fa0a312ce42de
author henrik.lundin@webrtc.org <henrik.lundin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Apr 17 08:29:10 2014 +0000
committer henrik.lundin@webrtc.org <henrik.lundin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Apr 17 08:29:10 2014 +0000
tree 6f9815b8be8345dc2d03bf59d191e9d23bb5e5a5
parent 6cec07f6a7ff5d90a55ba18c90cfad8da295aaa7

Removing AudioCoding duplicate tests

Reverting to using one version of ACM in ACM tests.

BUG=2996
R=turaj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/12079004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5924 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/audio_coding/main/test/Tester.cc

diff --git a/webrtc/modules/audio_coding/main/test/Tester.cc b/webrtc/modules/audio_coding/main/test/Tester.cc
index 581b7bd..a89c9cd 100644
--- a/webrtc/modules/audio_coding/main/test/Tester.cc
+++ b/webrtc/modules/audio_coding/main/test/Tester.cc
@@ -13,7 +13,6 @@
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/common.h"
 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
 #include "webrtc/modules/audio_coding/main/test/APITest.h"
 #include "webrtc/modules/audio_coding/main/test/EncodeDecodeTest.h"
@@ -24,7 +23,6 @@
 #include "webrtc/modules/audio_coding/main/test/TestStereo.h"
 #include "webrtc/modules/audio_coding/main/test/TestVADDTX.h"
 #include "webrtc/modules/audio_coding/main/test/TwoWayCommunication.h"
-#include "webrtc/modules/audio_coding/main/test/utility.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
@@ -39,21 +37,7 @@
   Trace::CreateTrace();
   Trace::SetTraceFile((webrtc::test::OutputPath() +
           "acm_allcodecs_trace.txt").c_str());
-  webrtc::Config config;
-
-  UseLegacyAcm(&config);
-  webrtc::TestAllCodecs(ACM_TEST_MODE, config).Perform();
-  Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, TestAllCodecsNewACM) {
-  Trace::CreateTrace();
-  Trace::SetTraceFile((webrtc::test::OutputPath() +
-          "acm_allcodecs_trace_new.txt").c_str());
-  webrtc::Config config;
-
-  UseNewAcm(&config);
-  webrtc::TestAllCodecs(ACM_TEST_MODE, config).Perform();
+  webrtc::TestAllCodecs(ACM_TEST_MODE).Perform();
   Trace::ReturnTrace();
 }
 
@@ -61,21 +45,7 @@
   Trace::CreateTrace();
   Trace::SetTraceFile((webrtc::test::OutputPath() +
       "acm_encodedecode_trace.txt").c_str());
-  webrtc::Config config;
-
-  UseLegacyAcm(&config);
-  webrtc::EncodeDecodeTest(ACM_TEST_MODE, config).Perform();
-  Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestEncodeDecodeNewACM)) {
-  Trace::CreateTrace();
-  Trace::SetTraceFile((webrtc::test::OutputPath() +
-      "acm_encodedecode_trace_new.txt").c_str());
-  webrtc::Config config;
-
-  UseNewAcm(&config);
-  webrtc::EncodeDecodeTest(ACM_TEST_MODE, config).Perform();
+  webrtc::EncodeDecodeTest(ACM_TEST_MODE).Perform();
   Trace::ReturnTrace();
 }
 
@@ -83,21 +53,7 @@
   Trace::CreateTrace();
   Trace::SetTraceFile((webrtc::test::OutputPath() +
       "acm_fec_trace.txt").c_str());
-  webrtc::Config config;
-
-  UseLegacyAcm(&config);
-  webrtc::TestFEC(config).Perform();
-  Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestFECNewACM)) {
-  Trace::CreateTrace();
-  Trace::SetTraceFile((webrtc::test::OutputPath() +
-      "acm_fec_trace_new.txt").c_str());
-  webrtc::Config config;
-
-  UseNewAcm(&config);
-  webrtc::TestFEC(config).Perform();
+  webrtc::TestFEC().Perform();
   Trace::ReturnTrace();
 }
 
@@ -105,21 +61,7 @@
   Trace::CreateTrace();
   Trace::SetTraceFile((webrtc::test::OutputPath() +
       "acm_isac_trace.txt").c_str());
-  webrtc::Config config;
-
-  UseLegacyAcm(&config);
-  webrtc::ISACTest(ACM_TEST_MODE, config).Perform();
-  Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestIsacNewACM)) {
-  Trace::CreateTrace();
-  Trace::SetTraceFile((webrtc::test::OutputPath() +
-      "acm_isac_trace_new.txt").c_str());
-  webrtc::Config config;
-
-  UseNewAcm(&config);
-  webrtc::ISACTest(ACM_TEST_MODE, config).Perform();
+  webrtc::ISACTest(ACM_TEST_MODE).Perform();
   Trace::ReturnTrace();
 }
 
@@ -127,21 +69,7 @@
   Trace::CreateTrace();
   Trace::SetTraceFile((webrtc::test::OutputPath() +
       "acm_twowaycom_trace.txt").c_str());
-  webrtc::Config config;
-
-  UseLegacyAcm(&config);
-  webrtc::TwoWayCommunication(ACM_TEST_MODE, config).Perform();
-  Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TwoWayCommunicationNewACM)) {
-  Trace::CreateTrace();
-  Trace::SetTraceFile((webrtc::test::OutputPath() +
-      "acm_twowaycom_trace_new.txt").c_str());
-  webrtc::Config config;
-
-  UseNewAcm(&config);
-  webrtc::TwoWayCommunication(ACM_TEST_MODE, config).Perform();
+  webrtc::TwoWayCommunication(ACM_TEST_MODE).Perform();
   Trace::ReturnTrace();
 }
 
@@ -149,21 +77,7 @@
   Trace::CreateTrace();
   Trace::SetTraceFile((webrtc::test::OutputPath() +
       "acm_stereo_trace.txt").c_str());
-  webrtc::Config config;
-
-  UseLegacyAcm(&config);
-  webrtc::TestStereo(ACM_TEST_MODE, config).Perform();
-  Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestStereoNewACM)) {
-  Trace::CreateTrace();
-  Trace::SetTraceFile((webrtc::test::OutputPath() +
-      "acm_stereo_trace_new.txt").c_str());
-  webrtc::Config config;
-
-  UseNewAcm(&config);
-  webrtc::TestStereo(ACM_TEST_MODE, config).Perform();
+  webrtc::TestStereo(ACM_TEST_MODE).Perform();
   Trace::ReturnTrace();
 }
 
@@ -171,21 +85,7 @@
   Trace::CreateTrace();
   Trace::SetTraceFile((webrtc::test::OutputPath() +
       "acm_vaddtx_trace.txt").c_str());
-  webrtc::Config config;
-
-  UseLegacyAcm(&config);
-  webrtc::TestVADDTX(config).Perform();
-  Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestVADDTXNewACM)) {
-  Trace::CreateTrace();
-  Trace::SetTraceFile((webrtc::test::OutputPath() +
-      "acm_vaddtx_trace_new.txt").c_str());
-  webrtc::Config config;
-
-  UseNewAcm(&config);
-  webrtc::TestVADDTX(config).Perform();
+  webrtc::TestVADDTX().Perform();
   Trace::ReturnTrace();
 }
 
@@ -193,21 +93,7 @@
   Trace::CreateTrace();
   Trace::SetTraceFile((webrtc::test::OutputPath() +
       "acm_opus_trace.txt").c_str());
-  webrtc::Config config;
-
-  UseLegacyAcm(&config);
-  webrtc::OpusTest(config).Perform();
-  Trace::ReturnTrace();
-}
-
-TEST(AudioCodingModuleTest, DISABLED_ON_ANDROID(TestOpusNewACM)) {
-  Trace::CreateTrace();
-  Trace::SetTraceFile((webrtc::test::OutputPath() +
-      "acm_opus_trace_new.txt").c_str());
-  webrtc::Config config;
-
-  UseNewAcm(&config);
-  webrtc::OpusTest(config).Perform();
+  webrtc::OpusTest().Perform();
   Trace::ReturnTrace();
 }
 
@@ -218,14 +104,7 @@
     Trace::CreateTrace();
     Trace::SetTraceFile((webrtc::test::OutputPath() +
         "acm_apitest_trace.txt").c_str());
-    webrtc::Config config;
-
-    UseLegacyAcm(&config);
-    webrtc::APITest(config).Perform();
-
-    UseNewAcm(&config);
-    webrtc::APITest(config).Perform();
-
+    webrtc::APITest().Perform();
     Trace::ReturnTrace();
   }
 #endif