Skip to content

Fix the broken master by the upgrade of GTest #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BewareMyPower merged 4 commits into from
Dec 1, 2022
Merged

Fix the broken master by the upgrade of GTest #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5a0f73
Fix gtest failure
BewareMyPower Dec 1, 2022
fdd7b87
Add operator<< for const reference
BewareMyPower Dec 1, 2022
53eea1d
stick to ubuntu-22.04 runner image
BewareMyPower Dec 1, 2022
8b20a69
Pass int to TestWithParam
BewareMyPower Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr-validation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

unit-tests:
name: Run unit tests
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 120

steps:
Expand Down
14 changes: 9 additions & 5 deletions tests/KeyValueSchemaTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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:
Expand All @@ -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));

Expand Down Expand Up @@ -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));