Fix the broken master by the upgrade of GTest (#133)

apache · Dec 1, 2022 · 91a97eb · 91a97eb
1 parent 88d1f20
commit 91a97eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/ci-pr-validation.yaml b/.github/workflows/ci-pr-validation.yaml
@@ -31,7 +31,7 @@ jobs:
 
   unit-tests:
     name: Run unit tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 120
 
     steps:

diff --git a/tests/KeyValueSchemaTest.cc b/tests/KeyValueSchemaTest.cc
@@ -25,10 +25,14 @@ using namespace pulsar;
 
 static const std::string lookupUrl = "pulsar://localhost:6650";
 
-class KeyValueSchemaTest : public ::testing::TestWithParam<KeyValueEncodingType> {
+// NOTE: Here we use int instead of KeyValueEncodingType because of a bug of GTest with GCC 11, see
+// https://github.com/google/googletest/issues/4079
+class KeyValueSchemaTest : public ::testing::TestWithParam<int> {
    public:
     void TearDown() override { client.close(); }
 
+    KeyValueEncodingType getEncodingType() const { return static_cast<KeyValueEncodingType>(GetParam()); }
+
     void createProducer(const std::string& topic, Producer& producer) {
         ProducerConfiguration configProducer;
         configProducer.setSchema(getKeyValueSchema());
@@ -45,7 +49,7 @@ class KeyValueSchemaTest : public ::testing::TestWithParam<KeyValueEncodingType>
     SchemaInfo getKeyValueSchema() {
         SchemaInfo keySchema(JSON, "key-json", jsonSchema);
         SchemaInfo valueSchema(JSON, "value-json", jsonSchema);
-        return SchemaInfo(keySchema, valueSchema, GetParam());
+        return SchemaInfo(keySchema, valueSchema, getEncodingType());
     }
 
    private:
@@ -55,7 +59,7 @@ class KeyValueSchemaTest : public ::testing::TestWithParam<KeyValueEncodingType>
 };
 
 TEST_P(KeyValueSchemaTest, testKeyValueSchema) {
-    auto encodingType = GetParam();
+    auto encodingType = getEncodingType();
     const std::string topicName =
         "testKeyValueSchema-" + std::string(strEncodingType(encodingType)) + std::to_string(time(nullptr));
 
@@ -85,5 +89,5 @@ TEST_P(KeyValueSchemaTest, testKeyValueSchema) {
     ASSERT_EQ(keyValueData.getValueAsString(), valueData);
 }
 
-INSTANTIATE_TEST_CASE_P(Pulsar, KeyValueSchemaTest,
-                        ::testing::Values(KeyValueEncodingType::INLINE, KeyValueEncodingType::SEPARATED));
+INSTANTIATE_TEST_SUITE_P(Pulsar, KeyValueSchemaTest,
+                         ::testing::Values(KeyValueEncodingType::INLINE, KeyValueEncodingType::SEPARATED));