fix Googletest function name

Forwarded: not-needed
Last-Update: 2019-08-06

Old version of Googletest use different (now deprecated) function name.

Gbp-Pq: Name fix_googletest.patch

diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc
index e4fd54e011ffd6f5fc199887cf5b3cc3493bbf79..63c4234012295f5630c613cf51c5fcf84a7cff4f 100644 (file)
--- a/src/google/protobuf/compiler/command_line_interface_unittest.cc
+++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc
@@ -2585,7 +2585,7 @@ TEST_P(EncodeDecodeTest, ProtoParseError) {
       "net/proto2/internal/no_such_file.proto: No such file or directory\n");
 }
 
-INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
+INSTANTIATE_TEST_CASE_P(FileDescriptorSetSource, EncodeDecodeTest,
                          testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
 }  // anonymous namespace
 

diff --git a/src/google/protobuf/descriptor_unittest.cc b/src/google/protobuf/descriptor_unittest.cc
index 898c1da195fe519b0e1bc64e15f79d968fb337d7..538ecb8846d1291a68b16d2a8beb9a216f6ca17a 100644 (file)
--- a/src/google/protobuf/descriptor_unittest.cc
+++ b/src/google/protobuf/descriptor_unittest.cc
@@ -2968,7 +2968,7 @@ TEST_P(AllowUnknownDependenciesTest,
   ASSERT_TRUE(pool_->FindMessageTypeByName("undeclared.Quux") == nullptr);
 }
 
-INSTANTIATE_TEST_SUITE_P(DatabaseSource, AllowUnknownDependenciesTest,
+INSTANTIATE_TEST_CASE_P(DatabaseSource, AllowUnknownDependenciesTest,
                          testing::Values(NO_DATABASE, FALLBACK_DATABASE));
 
 // ===================================================================

diff --git a/src/google/protobuf/dynamic_message_unittest.cc b/src/google/protobuf/dynamic_message_unittest.cc
index 42759de7768bbdb419dd8101fb20a884123f6309..b14f795b0a207bc261e2c2c5aab0a7500495cfcb 100644 (file)
--- a/src/google/protobuf/dynamic_message_unittest.cc
+++ b/src/google/protobuf/dynamic_message_unittest.cc
@@ -320,7 +320,7 @@ TEST_F(DynamicMessageTest, Proto3) {
   delete message;
 }
 
-INSTANTIATE_TEST_SUITE_P(UseArena, DynamicMessageTest, ::testing::Bool());
+INSTANTIATE_TEST_CASE_P(UseArena, DynamicMessageTest, ::testing::Bool());
 
 }  // namespace protobuf
 }  // namespace google

diff --git a/src/google/protobuf/map_field_test.cc b/src/google/protobuf/map_field_test.cc
index 05f83e23fa72f694c117f5e9dcae977c119afe9b..d3fa334002ee0358c776a75f7b90c96ed057f522 100644 (file)
--- a/src/google/protobuf/map_field_test.cc
+++ b/src/google/protobuf/map_field_test.cc
@@ -295,7 +295,7 @@ class MapFieldStateTest : public testing::TestWithParam<State> {
   State state_;
 };
 
-INSTANTIATE_TEST_SUITE_P(MapFieldStateTestInstance, MapFieldStateTest,
+INSTANTIATE_TEST_CASE_P(MapFieldStateTestInstance, MapFieldStateTest,
                          ::testing::Values(CLEAN, MAP_DIRTY, REPEATED_DIRTY));
 
 TEST_P(MapFieldStateTest, GetMap) {

diff --git a/src/google/protobuf/text_format_unittest.cc b/src/google/protobuf/text_format_unittest.cc
index 3bb20b793a68549b373ed553a9bf3ae849dde763..dafd62b4cc80a5e1dbf334fd8d416f12bb1aa8ed 100644 (file)
--- a/src/google/protobuf/text_format_unittest.cc
+++ b/src/google/protobuf/text_format_unittest.cc
@@ -80,7 +80,7 @@ const std::string kEscapeTestStringEscaped =
 
 class TextFormatTest : public testing::Test {
  public:
-  static void SetUpTestSuite() {
+  static void SetUpTestCase() {
     GOOGLE_CHECK_OK(File::GetContents(
         TestUtil::GetTestDataPath(
             "net/proto2/internal/"
@@ -103,7 +103,7 @@ std::string TextFormatTest::static_proto_debug_string_;
 
 class TextFormatExtensionsTest : public testing::Test {
  public:
-  static void SetUpTestSuite() {
+  static void SetUpTestCase() {
     GOOGLE_CHECK_OK(File::GetContents(
         TestUtil::GetTestDataPath("net/proto2/internal/testdata/"
                                   "text_format_unittest_extensions_data.txt"),

diff --git a/src/google/protobuf/util/internal/default_value_objectwriter_test.cc b/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
index 6236d5b190af586a35f9a8f7f10fae1c94f35f58..450fd3acd4af4f0b0fd1cfe37018068b615f51a1 100644 (file)
--- a/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
+++ b/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
@@ -73,7 +73,7 @@ class DefaultValueObjectWriterTest : public BaseDefaultValueObjectWriterTest {
   virtual ~DefaultValueObjectWriterTest() {}
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          DefaultValueObjectWriterTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -160,7 +160,7 @@ class DefaultValueObjectWriterSuppressListTest
   ~DefaultValueObjectWriterSuppressListTest() override {}
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          DefaultValueObjectWriterSuppressListTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));

diff --git a/src/google/protobuf/util/internal/protostream_objectsource_test.cc b/src/google/protobuf/util/internal/protostream_objectsource_test.cc
index 22fc3f62df3b61d07a59c60a3fe02fd674a5078f..614a050db6d815a898b935c57aa2856b7176ade0 100644 (file)
--- a/src/google/protobuf/util/internal/protostream_objectsource_test.cc
+++ b/src/google/protobuf/util/internal/protostream_objectsource_test.cc
@@ -290,7 +290,7 @@ class ProtostreamObjectSourceTest
   bool render_unknown_enum_values_;
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtostreamObjectSourceTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -606,7 +606,7 @@ class ProtostreamObjectSourceMapsTest : public ProtostreamObjectSourceTest {
   }
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtostreamObjectSourceMapsTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -748,7 +748,7 @@ class ProtostreamObjectSourceAnysTest : public ProtostreamObjectSourceTest {
   }
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtostreamObjectSourceAnysTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -985,7 +985,7 @@ class ProtostreamObjectSourceStructTest : public ProtostreamObjectSourceTest {
   }
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtostreamObjectSourceStructTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -1031,7 +1031,7 @@ class ProtostreamObjectSourceFieldMaskTest
   }
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtostreamObjectSourceFieldMaskTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -1094,7 +1094,7 @@ class ProtostreamObjectSourceTimestampTest
   }
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtostreamObjectSourceTimestampTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));

diff --git a/src/google/protobuf/util/internal/protostream_objectwriter_test.cc b/src/google/protobuf/util/internal/protostream_objectwriter_test.cc
index 6b22b528670992efa7380d665ad901f778c1c82a..8fe5989580818f36e7f5ede58b3d0bfa7bb5b4ab 100644 (file)
--- a/src/google/protobuf/util/internal/protostream_objectwriter_test.cc
+++ b/src/google/protobuf/util/internal/protostream_objectwriter_test.cc
@@ -184,7 +184,7 @@ class ProtoStreamObjectWriterTest : public BaseProtoStreamObjectWriterTest {
   virtual ~ProtoStreamObjectWriterTest() {}
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtoStreamObjectWriterTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -1190,7 +1190,7 @@ class ProtoStreamObjectWriterTimestampDurationTest
   }
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtoStreamObjectWriterTimestampDurationTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -1586,7 +1586,7 @@ class ProtoStreamObjectWriterStructTest
   }
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtoStreamObjectWriterStructTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -1777,7 +1777,7 @@ class ProtoStreamObjectWriterMapTest : public BaseProtoStreamObjectWriterTest {
   }
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtoStreamObjectWriterMapTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -1874,7 +1874,7 @@ class ProtoStreamObjectWriterAnyTest : public BaseProtoStreamObjectWriterTest {
   }
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtoStreamObjectWriterAnyTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -2519,7 +2519,7 @@ class ProtoStreamObjectWriterFieldMaskTest
   }
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtoStreamObjectWriterFieldMaskTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -2772,7 +2772,7 @@ class ProtoStreamObjectWriterWrappersTest
   }
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtoStreamObjectWriterWrappersTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));
@@ -2795,7 +2795,7 @@ class ProtoStreamObjectWriterOneOfsTest
   }
 };
 
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
+INSTANTIATE_TEST_CASE_P(DifferentTypeInfoSourceTest,
                          ProtoStreamObjectWriterOneOfsTest,
                          ::testing::Values(
                              testing::USE_TYPE_RESOLVER));