Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Fix StandardMessageCodec test leaks #27959

Merged
merged 1 commit into from
Aug 9, 2021
Merged

Fix StandardMessageCodec test leaks #27959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions shell/platform/common/client_wrapper/standard_codec.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,8 @@ const StandardMessageCodec& StandardMessageCodec::GetInstance(
if (!serializer) {
serializer = &StandardCodecSerializer::GetInstance();
}
auto* sInstances = new std::map<const StandardCodecSerializer*,
std::unique_ptr<StandardMessageCodec>>;
static auto* sInstances = new std::map<const StandardCodecSerializer*,
std::unique_ptr<StandardMessageCodec>>;
auto it = sInstances->find(serializer);
if (it == sInstances->end()) {
// Uses new due to private constructor (to prevent API clients from
Expand Down Expand Up @@ -342,8 +342,8 @@ const StandardMethodCodec& StandardMethodCodec::GetInstance(
if (!serializer) {
serializer = &StandardCodecSerializer::GetInstance();
}
auto* sInstances = new std::map<const StandardCodecSerializer*,
std::unique_ptr<StandardMethodCodec>>;
static auto* sInstances = new std::map<const StandardCodecSerializer*,
std::unique_ptr<StandardMethodCodec>>;
auto it = sInstances->find(serializer);
if (it == sInstances->end()) {
// Uses new due to private constructor (to prevent API clients from
Expand Down
8 changes: 8 additions & 0 deletions shell/platform/common/client_wrapper/standard_message_codec_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ static void CheckEncodeDecodeWithEncodePrefix(
EXPECT_EQ(value, *decoded);
}

TEST(StandardMessageCodec, GetInstanceCachesInstance) {
const StandardMessageCodec& codec_a =
StandardMessageCodec::GetInstance(nullptr);
const StandardMessageCodec& codec_b =
StandardMessageCodec::GetInstance(nullptr);
EXPECT_EQ(&codec_a, &codec_b);
}

TEST(StandardMessageCodec, CanEncodeAndDecodeNull) {
std::vector<uint8_t> bytes = {0x00};
CheckEncodeDecode(EncodableValue(), bytes);
Expand Down
8 changes: 8 additions & 0 deletions shell/platform/common/client_wrapper/standard_method_codec_unittests.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ bool MethodCallsAreEqual(const MethodCall<>& a, const MethodCall<>& b) {

} // namespace

TEST(StandardMethodCodec, GetInstanceCachesInstance) {
const StandardMethodCodec& codec_a =
StandardMethodCodec::GetInstance(nullptr);
const StandardMethodCodec& codec_b =
StandardMethodCodec::GetInstance(nullptr);
EXPECT_EQ(&codec_a, &codec_b);
}

TEST(StandardMethodCodec, HandlesMethodCallsWithNullArguments) {
const StandardMethodCodec& codec = StandardMethodCodec::GetInstance();
MethodCall<> call("hello", nullptr);
Expand Down