From 71061bcca8135375fd9c8af729facb1722103c86 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Tue, 4 Jun 2019 09:01:51 +0200 Subject: [PATCH] Replace calls to deprecated googletest APIs. SetUpTestCase/TearDownTestCase -> SetUpTestSuite/TearDownTestSuite. TBR=kwiberg@webrtc.org Bug: None Change-Id: I6d873c62d6b5c9d7100624d00e1c4894d686a9f1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140041 Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#28189} --- media/sctp/sctp_transport_unittest.cc | 2 +- .../audio_processing/audio_processing_unittest.cc | 13 ++++--------- p2p/base/stun_port_unittest.cc | 2 +- test/testsupport/file_utils_unittest.cc | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/media/sctp/sctp_transport_unittest.cc b/media/sctp/sctp_transport_unittest.cc index d7ccd584c1..703f7a9634 100644 --- a/media/sctp/sctp_transport_unittest.cc +++ b/media/sctp/sctp_transport_unittest.cc @@ -120,7 +120,7 @@ class SctpTransportTest : public ::testing::Test, public sigslot::has_slots<> { protected: // usrsctp uses the NSS random number generator on non-Android platforms, // so we need to initialize SSL. - static void SetUpTestCase() {} + static void SetUpTestSuite() {} void SetupConnectedTransportsWithTwoStreams() { SetupConnectedTransportsWithTwoStreams(kTransport1Port, kTransport2Port); diff --git a/modules/audio_processing/audio_processing_unittest.cc b/modules/audio_processing/audio_processing_unittest.cc index 7015042395..1c1d741b3f 100644 --- a/modules/audio_processing/audio_processing_unittest.cc +++ b/modules/audio_processing/audio_processing_unittest.cc @@ -345,12 +345,9 @@ class ApmTest : public ::testing::Test { virtual void SetUp(); virtual void TearDown(); - static void SetUpTestCase() { - } + static void SetUpTestSuite() {} - static void TearDownTestCase() { - ClearTempFiles(); - } + static void TearDownTestSuite() { ClearTempFiles(); } // Used to select between int and float interface tests. enum Format { @@ -1932,7 +1929,7 @@ class AudioProcessingTest virtual ~AudioProcessingTest() {} - static void SetUpTestCase() { + static void SetUpTestSuite() { // Create all needed output reference files. const int kNativeRates[] = {8000, 16000, 32000, 48000}; const size_t kNumChannels[] = {1, 2}; @@ -1953,9 +1950,7 @@ class AudioProcessingTest ClearTempOutFiles(); } - static void TearDownTestCase() { - ClearTempFiles(); - } + static void TearDownTestSuite() { ClearTempFiles(); } // Runs a process pass on files with the given parameters and dumps the output // to a file specified with |output_file_prefix|. Both forward and reverse diff --git a/p2p/base/stun_port_unittest.cc b/p2p/base/stun_port_unittest.cc index 98e41f9aa3..854156dc54 100644 --- a/p2p/base/stun_port_unittest.cc +++ b/p2p/base/stun_port_unittest.cc @@ -133,7 +133,7 @@ class StunPortTestBase : public ::testing::Test, public sigslot::has_slots<> { } protected: - static void SetUpTestCase() { + static void SetUpTestSuite() { // Ensure the RNG is inited. rtc::InitRandom(NULL, 0); } diff --git a/test/testsupport/file_utils_unittest.cc b/test/testsupport/file_utils_unittest.cc index d4b4653b45..0ff1254462 100644 --- a/test/testsupport/file_utils_unittest.cc +++ b/test/testsupport/file_utils_unittest.cc @@ -73,7 +73,7 @@ class FileUtilsTest : public ::testing::Test { FileUtilsTest() {} ~FileUtilsTest() override {} // Runs before the first test - static void SetUpTestCase() { + static void SetUpTestSuite() { original_working_dir_ = webrtc::test::WorkingDir(); } void SetUp() override { ASSERT_EQ(chdir(original_working_dir_.c_str()), 0); }