From 668755ce388787d1f4eae5bd72e38fb12921079c Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <tmpsantos@gmail.com>
Date: Tue, 7 Apr 2020 21:55:19 +0300
Subject: [test] Rename deprecated gtest method

The old name was marked as deprecated and failing to build with clang.
---
 test/style/expression/expression.test.cpp | 47 ++++++++++++++++---------------
 test/style/style_parser.test.cpp          | 39 ++++++++++++-------------
 2 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/test/style/expression/expression.test.cpp b/test/style/expression/expression.test.cpp
index b137df769a..07f6cf173a 100644
--- a/test/style/expression/expression.test.cpp
+++ b/test/style/expression/expression.test.cpp
@@ -79,28 +79,29 @@ TEST_P(ExpressionEqualityTest, ExpressionEquality) {
     EXPECT_TRUE(*expression_a1 != *expression_b);
 }
 
-INSTANTIATE_TEST_CASE_P(Expression, ExpressionEqualityTest, ::testing::ValuesIn([] {
-    std::vector<std::string> names;
-    const std::string ending = ".a.json";
-
-    const std::string style_directory = "test/fixtures/expression_equality";
-    DIR *dir = opendir(style_directory.c_str());
-    if (dir != nullptr) {
-        for (dirent *dp = nullptr; (dp = readdir(dir)) != nullptr;) {
-            const std::string name = dp->d_name;
+INSTANTIATE_TEST_SUITE_P(Expression, ExpressionEqualityTest, ::testing::ValuesIn([] {
+                             std::vector<std::string> names;
+                             const std::string ending = ".a.json";
+
+                             const std::string style_directory = "test/fixtures/expression_equality";
+                             DIR* dir = opendir(style_directory.c_str());
+                             if (dir != nullptr) {
+                                 for (dirent* dp = nullptr; (dp = readdir(dir)) != nullptr;) {
+                                     const std::string name = dp->d_name;
 #if ANDROID
-            // Android unit test uses number-format stub implementation so skip the tests
-            if (name.find("number-format") != std::string::npos) {
-                continue;
-            }
+                                     // Android unit test uses number-format stub implementation so skip the tests
+                                     if (name.find("number-format") != std::string::npos) {
+                                         continue;
+                                     }
 #endif
-            if (name.length() >= ending.length() && name.compare(name.length() - ending.length(), ending.length(), ending) == 0) {
-                names.push_back(name.substr(0, name.length() - ending.length()));
-            }
-        }
-        closedir(dir);
-    }
-
-    EXPECT_GT(names.size(), 0u);
-    return names;
-}()));
+                                     if (name.length() >= ending.length() &&
+                                         name.compare(name.length() - ending.length(), ending.length(), ending) == 0) {
+                                         names.push_back(name.substr(0, name.length() - ending.length()));
+                                     }
+                                 }
+                                 closedir(dir);
+                             }
+
+                             EXPECT_GT(names.size(), 0u);
+                             return names;
+                         }()));
diff --git a/test/style/style_parser.test.cpp b/test/style/style_parser.test.cpp
index a18a9bbf57..7607dbd077 100644
--- a/test/style/style_parser.test.cpp
+++ b/test/style/style_parser.test.cpp
@@ -74,25 +74,26 @@ TEST_P(StyleParserTest, ParseStyle) {
     }
 }
 
-INSTANTIATE_TEST_CASE_P(StyleParser, StyleParserTest, ::testing::ValuesIn([] {
-    std::vector<std::string> names;
-    const std::string ending = ".info.json";
-
-    const std::string style_directory = "test/fixtures/style_parser";
-    DIR *dir = opendir(style_directory.c_str());
-    if (dir != nullptr) {
-        for (dirent *dp = nullptr; (dp = readdir(dir)) != nullptr;) {
-            const std::string name = dp->d_name;
-            if (name.length() >= ending.length() && name.compare(name.length() - ending.length(), ending.length(), ending) == 0) {
-                names.push_back(name.substr(0, name.length() - ending.length()));
-            }
-        }
-        closedir(dir);
-    }
-
-    EXPECT_GT(names.size(), 0u);
-    return names;
-}()));
+INSTANTIATE_TEST_SUITE_P(StyleParser, StyleParserTest, ::testing::ValuesIn([] {
+                             std::vector<std::string> names;
+                             const std::string ending = ".info.json";
+
+                             const std::string style_directory = "test/fixtures/style_parser";
+                             DIR *dir = opendir(style_directory.c_str());
+                             if (dir != nullptr) {
+                                 for (dirent *dp = nullptr; (dp = readdir(dir)) != nullptr;) {
+                                     const std::string name = dp->d_name;
+                                     if (name.length() >= ending.length() &&
+                                         name.compare(name.length() - ending.length(), ending.length(), ending) == 0) {
+                                         names.push_back(name.substr(0, name.length() - ending.length()));
+                                     }
+                                 }
+                                 closedir(dir);
+                             }
+
+                             EXPECT_GT(names.size(), 0u);
+                             return names;
+                         }()));
 
 TEST(StyleParser, FontStacks) {
     style::Parser parser;
-- 
cgit v1.2.1