commit bf3fe26f7e1b51ac3578bdd27616f8c3b6e9b7d3
author James Zern <jzern@google.com> Fri Jul 10 02:35:32 2020
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 10 02:35:32 2020
tree 29c2bd97e7d1a18b6de70695e6d1a960fd7be8f6
parent 5b7882139c2f64d4ff830e1665e04a4d72f9e484
parent 6ee3f3649f21b83cfec6d08265e3724693a846af

Merge "test/*: rename *TestCase to TestSuite"

test/blockiness_test.cc

diff --git a/test/blockiness_test.cc b/test/blockiness_test.cc
index 75aa293..1ad444a 100644
--- a/test/blockiness_test.cc
+++ b/test/blockiness_test.cc
@@ -35,14 +35,14 @@
  public:
   BlockinessTestBase(int width, int height) : width_(width), height_(height) {}
 
-  static void SetUpTestCase() {
+  static void SetUpTestSuite() {
     source_data_ = reinterpret_cast<uint8_t *>(
         vpx_memalign(kDataAlignment, kDataBufferSize));
     reference_data_ = reinterpret_cast<uint8_t *>(
         vpx_memalign(kDataAlignment, kDataBufferSize));
   }
 
-  static void TearDownTestCase() {
+  static void TearDownTestSuite() {
     vpx_free(source_data_);
     source_data_ = NULL;
     vpx_free(reference_data_);

test/consistency_test.cc

diff --git a/test/consistency_test.cc b/test/consistency_test.cc
index 69ebaf7..f31fd8c 100644
--- a/test/consistency_test.cc
+++ b/test/consistency_test.cc
@@ -39,7 +39,7 @@
  public:
   ConsistencyTestBase(int width, int height) : width_(width), height_(height) {}
 
-  static void SetUpTestCase() {
+  static void SetUpTestSuite() {
     source_data_[0] = reinterpret_cast<uint8_t *>(
         vpx_memalign(kDataAlignment, kDataBufferSize));
     reference_data_[0] = reinterpret_cast<uint8_t *>(
@@ -52,7 +52,7 @@
   }
 
   static void ClearSsim() { memset(ssim_array_, 0, kDataBufferSize / 16); }
-  static void TearDownTestCase() {
+  static void TearDownTestSuite() {
     vpx_free(source_data_[0]);
     source_data_[0] = NULL;
     vpx_free(reference_data_[0]);

test/convolve_test.cc

diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index 7330e97..6eef26f 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -341,7 +341,7 @@
 
 class ConvolveTest : public ::testing::TestWithParam<ConvolveParam> {
  public:
-  static void SetUpTestCase() {
+  static void SetUpTestSuite() {
     // Force input_ to be unaligned, output to be 16 byte aligned.
     input_ = reinterpret_cast<uint8_t *>(
                  vpx_memalign(kDataAlignment, kInputBufferSize + 1)) +
@@ -363,7 +363,7 @@
 
   virtual void TearDown() { libvpx_test::ClearSystemState(); }
 
-  static void TearDownTestCase() {
+  static void TearDownTestSuite() {
     vpx_free(input_ - 1);
     input_ = NULL;
     vpx_free(output_);

test/cq_test.cc

diff --git a/test/cq_test.cc b/test/cq_test.cc
index 3126f3b..292adb0 100644
--- a/test/cq_test.cc
+++ b/test/cq_test.cc
@@ -29,9 +29,9 @@
   // maps the cqlevel to the bitrate produced.
   typedef std::map<int, uint32_t> BitrateMap;
 
-  static void SetUpTestCase() { bitrates_.clear(); }
+  static void SetUpTestSuite() { bitrates_.clear(); }
 
-  static void TearDownTestCase() {
+  static void TearDownTestSuite() {
     ASSERT_TRUE(!HasFailure())
         << "skipping bitrate validation due to earlier failure.";
     uint32_t prev_actual_bitrate = kCQTargetBitrate;