Skip to content

Commit

Permalink
Pass parameters to mojo::test::SerializeAndDeserialize() by reference
Browse files Browse the repository at this point in the history
"Small" cleanup request from dcheng.

R=sky@chromium.org
TBR=

Bug: 1144462
Change-Id: I18a116a426bc8d8adde438a050f0b7e313df56a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2551258
Auto-Submit: danakj <danakj@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829713}
  • Loading branch information
danakj authored and Commit Bot committed Nov 20, 2020
1 parent ffc7e3c commit b01e68c
Show file tree
Hide file tree
Showing 57 changed files with 326 additions and 352 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TEST(LocalSearchMojomTraitsTest, ContentTraits) {
Content output;

ASSERT_TRUE(
mojo::test::SerializeAndDeserialize<mojom::Content>(&input, &output));
mojo::test::SerializeAndDeserialize<mojom::Content>(input, output));
EXPECT_EQ(input.id, output.id);
EXPECT_EQ(input.content, output.content);
EXPECT_EQ(input.weight, output.weight);
Expand All @@ -35,7 +35,7 @@ TEST(LocalSearchMojomTraitsTest, DataTraits) {
Data output;

ASSERT_TRUE(
mojo::test::SerializeAndDeserialize<mojom::Data>(&input, &output));
mojo::test::SerializeAndDeserialize<mojom::Data>(input, output));
EXPECT_EQ(input.id, output.id);
EXPECT_EQ(input.contents[0].id, output.contents[0].id);
EXPECT_EQ(input.contents[0].content, output.contents[0].content);
Expand All @@ -52,7 +52,7 @@ TEST(LocalSearchMojomTraitsTest, DataTraits) {
Data output;

ASSERT_TRUE(
mojo::test::SerializeAndDeserialize<mojom::Data>(&input, &output));
mojo::test::SerializeAndDeserialize<mojom::Data>(input, output));
EXPECT_EQ(input.id, output.id);
EXPECT_EQ(input.contents[0].id, output.contents[0].id);
EXPECT_EQ(input.contents[0].content, output.contents[0].content);
Expand All @@ -68,8 +68,8 @@ TEST(LocalSearchMojomTraitsTest, SearchParamsTraits) {
SearchParams input{0.1, 0.2, 0.3};
SearchParams output;

ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::SearchParams>(
&input, &output));
ASSERT_TRUE(
mojo::test::SerializeAndDeserialize<mojom::SearchParams>(input, output));
EXPECT_EQ(input.relevance_threshold, output.relevance_threshold);
EXPECT_EQ(input.prefix_threshold, output.prefix_threshold);
EXPECT_EQ(input.fuzzy_threshold, output.fuzzy_threshold);
Expand All @@ -80,7 +80,7 @@ TEST(LocalSearchMojomTraitsTest, PositionTraits) {
Position output;

ASSERT_TRUE(
mojo::test::SerializeAndDeserialize<mojom::Position>(&input, &output));
mojo::test::SerializeAndDeserialize<mojom::Position>(input, output));
EXPECT_EQ(input.content_id, output.content_id);
EXPECT_EQ(input.start, output.start);
EXPECT_EQ(input.length, output.length);
Expand All @@ -95,7 +95,7 @@ TEST(LocalSearchMojomTraitsTest, ResultTraits) {
Result output;

ASSERT_TRUE(
mojo::test::SerializeAndDeserialize<mojom::Result>(&input, &output));
mojo::test::SerializeAndDeserialize<mojom::Result>(input, output));
EXPECT_EQ(input.id, output.id);
EXPECT_EQ(input.score, output.score);
EXPECT_EQ(input.positions[0].content_id, output.positions[0].content_id);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ TEST(MultiDeviceMojomStructTraitsTest, BeaconSeed) {

chromeos::multidevice::BeaconSeed output;
EXPECT_TRUE(mojo::test::SerializeAndDeserialize<
chromeos::multidevice::mojom::BeaconSeed>(&input, &output));
chromeos::multidevice::mojom::BeaconSeed>(input, output));

EXPECT_EQ(kTestBeaconSeedData, output.data());
EXPECT_EQ(kTestBeaconSeedStartTimeMillis, output.start_time().ToJavaTime());
Expand Down Expand Up @@ -66,7 +66,7 @@ TEST(MultiDeviceMojomStructTraitsTest, RemoteDevice) {

chromeos::multidevice::RemoteDevice output;
EXPECT_TRUE(mojo::test::SerializeAndDeserialize<
chromeos::multidevice::mojom::RemoteDevice>(&input, &output));
chromeos::multidevice::mojom::RemoteDevice>(input, output));

EXPECT_EQ("userEmail", output.user_email);
EXPECT_EQ("instanceId", output.instance_id);
Expand Down
3 changes: 1 addition & 2 deletions components/arc/mojom/ime_mojom_traits_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ TEST(KeyEventStructTraitsTest, Convert) {
for (size_t idx = 0; idx < base::size(kTestData); ++idx) {
auto copy = std::make_unique<ui::KeyEvent>(kTestData[idx]);
std::unique_ptr<ui::KeyEvent> output;
mojo::test::SerializeAndDeserialize<arc::mojom::KeyEventData>(&copy,
&output);
mojo::test::SerializeAndDeserialize<arc::mojom::KeyEventData>(copy, output);
ExpectKeyEventsEqual(*copy, *output);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ TEST(VideoAcceleratorStructTraitsTest, ConvertVideoFrameLayout) {
std::unique_ptr<media::VideoFrameLayout> input =
std::make_unique<media::VideoFrameLayout>(*layout);
std::unique_ptr<media::VideoFrameLayout> output;
mojo::test::SerializeAndDeserialize<arc::mojom::VideoFrameLayout>(&input,
&output);
mojo::test::SerializeAndDeserialize<arc::mojom::VideoFrameLayout>(input,
output);

EXPECT_EQ(output->format(), kFormat);
EXPECT_EQ(output->coded_size(), kCodedSize);
Expand All @@ -52,8 +52,8 @@ TEST(VideoAcceleratorStructTraitsTest, ConvertVideoFrameLayout) {
TEST(VideoAcceleratorStructTraitsTest, ConvertNullVideoFrameLayout) {
std::unique_ptr<media::VideoFrameLayout> input;
std::unique_ptr<media::VideoFrameLayout> output;
mojo::test::SerializeAndDeserialize<arc::mojom::VideoFrameLayout>(&input,
&output);
mojo::test::SerializeAndDeserialize<arc::mojom::VideoFrameLayout>(input,
output);

EXPECT_FALSE(output);
}
Expand Down
14 changes: 7 additions & 7 deletions components/js_injection/common/origin_matcher_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ TEST_F(OriginMatcherTest, SerializeAndDeserializeMatchAll) {
OriginMatcher deserialized;
ASSERT_TRUE(matcher.AddRuleFromString("*"));
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::OriginMatcher>(
&matcher, &deserialized));
matcher, deserialized));
ASSERT_NO_FATAL_FAILURE(CompareMatchers(matcher, deserialized));
}

Expand All @@ -326,7 +326,7 @@ TEST_F(OriginMatcherTest, SerializeAndDeserializeSubdomainMatcher) {
OriginMatcher deserialized;
ASSERT_TRUE(matcher.AddRuleFromString("https://*.example.com"));
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::OriginMatcher>(
&matcher, &deserialized));
matcher, deserialized));
ASSERT_NO_FATAL_FAILURE(CompareMatchers(matcher, deserialized));
}

Expand All @@ -341,7 +341,7 @@ TEST_F(OriginMatcherTest, SerializeAndDeserializeInvalidSubdomain) {
matcher.SetRules(std::move(rules));
}
EXPECT_FALSE(mojo::test::SerializeAndDeserialize<mojom::OriginMatcher>(
&matcher, &deserialized));
matcher, deserialized));
}

TEST_F(OriginMatcherTest, SerializeAndDeserializeInvalidScheme) {
Expand All @@ -355,7 +355,7 @@ TEST_F(OriginMatcherTest, SerializeAndDeserializeInvalidScheme) {
matcher.SetRules(std::move(rules));
}
EXPECT_FALSE(mojo::test::SerializeAndDeserialize<mojom::OriginMatcher>(
&matcher, &deserialized));
matcher, deserialized));
}

TEST_F(OriginMatcherTest, SerializeAndDeserializeTooManyWildcards) {
Expand All @@ -369,7 +369,7 @@ TEST_F(OriginMatcherTest, SerializeAndDeserializeTooManyWildcards) {
matcher.SetRules(std::move(rules));
}
EXPECT_FALSE(mojo::test::SerializeAndDeserialize<mojom::OriginMatcher>(
&matcher, &deserialized));
matcher, deserialized));
}

TEST_F(OriginMatcherTest, SerializeAndDeserializeInvalidWildcard) {
Expand All @@ -383,7 +383,7 @@ TEST_F(OriginMatcherTest, SerializeAndDeserializeInvalidWildcard) {
matcher.SetRules(std::move(rules));
}
EXPECT_FALSE(mojo::test::SerializeAndDeserialize<mojom::OriginMatcher>(
&matcher, &deserialized));
matcher, deserialized));
}

TEST_F(OriginMatcherTest, SerializeAndDeserializeValidWildcard) {
Expand All @@ -397,7 +397,7 @@ TEST_F(OriginMatcherTest, SerializeAndDeserializeValidWildcard) {
matcher.SetRules(std::move(rules));
}
EXPECT_TRUE(mojo::test::SerializeAndDeserialize<mojom::OriginMatcher>(
&matcher, &deserialized));
matcher, deserialized));
ASSERT_NO_FATAL_FAILURE(CompareMatchers(matcher, deserialized));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void AssertSerializeAndDeserializeSucceeds(std::vector<UserType> test_cases) {
for (auto original : test_cases) {
UserType copied;
EXPECT_TRUE(
mojo::test::SerializeAndDeserialize<MojomType>(&original, &copied));
mojo::test::SerializeAndDeserialize<MojomType>(original, copied));
EXPECT_EQ(original, copied);
}
}
Expand Down
16 changes: 8 additions & 8 deletions device/gamepad/public/cpp/gamepad_mojom_traits_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -173,35 +173,35 @@ TEST_F(GamepadStructTraitsTest, GamepadCommon) {
Gamepad gamepad_in = GetWebGamepadInstance(GamepadCommon);
Gamepad gamepad_out;

ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::Gamepad>(
&gamepad_in, &gamepad_out));
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::Gamepad>(gamepad_in,
gamepad_out));
EXPECT_EQ(true, isWebGamepadEqual(gamepad_in, gamepad_out));
}

TEST_F(GamepadStructTraitsTest, GamepadPose_HasOrientation) {
Gamepad gamepad_in = GetWebGamepadInstance(GamepadPose_HasOrientation);
Gamepad gamepad_out;

ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::Gamepad>(
&gamepad_in, &gamepad_out));
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::Gamepad>(gamepad_in,
gamepad_out));
EXPECT_EQ(true, isWebGamepadEqual(gamepad_in, gamepad_out));
}

TEST_F(GamepadStructTraitsTest, GamepadPose_HasPosition) {
Gamepad gamepad_in = GetWebGamepadInstance(GamepadPose_HasPosition);
Gamepad gamepad_out;

ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::Gamepad>(
&gamepad_in, &gamepad_out));
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::Gamepad>(gamepad_in,
gamepad_out));
EXPECT_EQ(true, isWebGamepadEqual(gamepad_in, gamepad_out));
}

TEST_F(GamepadStructTraitsTest, GamepadPose_Null) {
Gamepad gamepad_in = GetWebGamepadInstance(GamepadPose_Null);
Gamepad gamepad_out;

ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::Gamepad>(
&gamepad_in, &gamepad_out));
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::Gamepad>(gamepad_in,
gamepad_out));
EXPECT_EQ(true, isWebGamepadEqual(gamepad_in, gamepad_out));
}
} // namespace device
4 changes: 2 additions & 2 deletions fuchsia/mojom/fidl_interface_request_mojom_traits_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ TEST(InterfaceRequestStructTraitsTest, Serialization) {
fidl::InterfaceRequest<TestInterface> output_request;

EXPECT_TRUE(mojo::test::SerializeAndDeserialize<
fuchsia::test::mojom::TestInterfaceRequest>(&input_request,
&output_request));
fuchsia::test::mojom::TestInterfaceRequest>(input_request,
output_request));
EXPECT_TRUE(output_request.is_valid());
}

Expand Down
2 changes: 1 addition & 1 deletion gpu/ipc/common/gpu_memory_buffer_impl_test_template.h
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ TYPED_TEST_P(GpuMemoryBufferImplTest, SerializeAndDeserialize) {

gfx::GpuMemoryBufferHandle output_handle;
mojo::test::SerializeAndDeserialize<gfx::mojom::GpuMemoryBufferHandle>(
&handle, &output_handle);
handle, output_handle);
EXPECT_EQ(output_handle.type, kBufferType);

std::unique_ptr<GpuMemoryBufferImpl> buffer(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ TEST(VideoEncoderInfoStructTraitTest, RoundTrip) {

::media::VideoEncoderInfo output = input;
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::VideoEncoderInfo>(
&input, &output));
input, output));
EXPECT_EQ(input, output);
}

Expand All @@ -47,7 +47,7 @@ TEST(SpatialLayerStructTraitTest, RoundTrip) {
input_spatial_layer.num_of_temporal_layers = 3u;
::media::VideoEncodeAccelerator::Config::SpatialLayer output_spatial_layer;
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::SpatialLayer>(
&input_spatial_layer, &output_spatial_layer));
input_spatial_layer, output_spatial_layer));
EXPECT_EQ(input_spatial_layer, output_spatial_layer);
}

Expand Down Expand Up @@ -78,7 +78,7 @@ TEST(VideoEncodeAcceleratorConfigStructTraitTest, RoundTrip) {
::media::VideoEncodeAccelerator::Config output_config{};
ASSERT_TRUE(
mojo::test::SerializeAndDeserialize<mojom::VideoEncodeAcceleratorConfig>(
&input_config, &output_config));
input_config, output_config));
DVLOG(4) << output_config.AsHumanReadableString();
EXPECT_EQ(input_config, output_config);
}
Expand All @@ -91,7 +91,7 @@ TEST(BitstreamBufferMetadataTraitTest, RoundTrip) {
::media::BitstreamBufferMetadata output_metadata;
ASSERT_TRUE(
mojo::test::SerializeAndDeserialize<mojom::BitstreamBufferMetadata>(
&input_metadata, &output_metadata));
input_metadata, output_metadata));
EXPECT_EQ(input_metadata, output_metadata);

Vp8Metadata vp8;
Expand All @@ -102,7 +102,7 @@ TEST(BitstreamBufferMetadataTraitTest, RoundTrip) {
output_metadata = ::media::BitstreamBufferMetadata();
ASSERT_TRUE(
mojo::test::SerializeAndDeserialize<mojom::BitstreamBufferMetadata>(
&input_metadata, &output_metadata));
input_metadata, output_metadata));
EXPECT_EQ(input_metadata, output_metadata);
input_metadata.vp8.reset();

Expand All @@ -115,7 +115,7 @@ TEST(BitstreamBufferMetadataTraitTest, RoundTrip) {
output_metadata = ::media::BitstreamBufferMetadata();
ASSERT_TRUE(
mojo::test::SerializeAndDeserialize<mojom::BitstreamBufferMetadata>(
&input_metadata, &output_metadata));
input_metadata, output_metadata));
EXPECT_EQ(input_metadata, output_metadata);
}
} // namespace media
10 changes: 5 additions & 5 deletions mojo/public/cpp/base/big_buffer_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ TEST(BigBufferTest, EmptyBuffer) {
EXPECT_EQ(BigBuffer::StorageType::kBytes, in.storage_type());
EXPECT_EQ(0u, in.size());

ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::BigBuffer>(&in, &out));
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::BigBuffer>(in, out));

EXPECT_EQ(BigBuffer::StorageType::kBytes, out.storage_type());
EXPECT_TRUE(BufferEquals(in, out));
Expand All @@ -41,7 +41,7 @@ TEST(BigBufferTest, SmallDataSize) {
EXPECT_EQ(BigBuffer::StorageType::kBytes, in.storage_type());

BigBuffer out;
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::BigBuffer>(&in, &out));
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::BigBuffer>(in, out));

EXPECT_EQ(BigBuffer::StorageType::kBytes, out.storage_type());
EXPECT_TRUE(BufferEquals(in, out));
Expand All @@ -56,7 +56,7 @@ TEST(BigBufferTest, LargeDataSize) {
EXPECT_EQ(BigBuffer::StorageType::kSharedMemory, in.storage_type());

BigBuffer out;
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::BigBuffer>(&in, &out));
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::BigBuffer>(in, out));

EXPECT_EQ(BigBuffer::StorageType::kSharedMemory, out.storage_type());

Expand All @@ -74,15 +74,15 @@ TEST(BigBufferTest, InvalidBuffer) {
EXPECT_EQ(invalid_view.storage_type(),
BigBuffer::StorageType::kInvalidBuffer);
EXPECT_FALSE(mojo::test::SerializeAndDeserialize<mojom::BigBuffer>(
&invalid_view, &out_view));
invalid_view, out_view));

BigBuffer out_buffer;
auto invalid_buffer =
BigBufferView::ToBigBuffer(BigBufferView::CreateInvalidForTest());
EXPECT_EQ(invalid_buffer.storage_type(),
BigBuffer::StorageType::kInvalidBuffer);
EXPECT_FALSE(mojo::test::SerializeAndDeserialize<mojom::BigBuffer>(
&invalid_buffer, &out_buffer));
invalid_buffer, out_buffer));
}

} // namespace big_buffer_unittest
Expand Down
6 changes: 3 additions & 3 deletions mojo/public/cpp/base/big_string_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ namespace big_string_unittest {
TEST(BigStringTest, Empty) {
std::string in;
std::string out;
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::BigString>(&in, &out));
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::BigString>(in, out));
EXPECT_EQ(in, out);
}

TEST(BigStringTest, Short) {
std::string in("hello world");
std::string out;
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::BigString>(&in, &out));
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::BigString>(in, out));
EXPECT_EQ(in, out);
}

Expand All @@ -35,7 +35,7 @@ TEST(BigStringTest, Long) {
base::RandBytes(&in[0], kLargeStringSize);

std::string out;
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::BigString>(&in, &out));
ASSERT_TRUE(mojo::test::SerializeAndDeserialize<mojom::BigString>(in, out));
EXPECT_EQ(in, out);
}

Expand Down
2 changes: 1 addition & 1 deletion mojo/public/cpp/base/file_path_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ TEST(FilePathTest, File) {
base::FilePath file_out;

ASSERT_TRUE(
mojo::test::SerializeAndDeserialize<mojom::FilePath>(&file, &file_out));
mojo::test::SerializeAndDeserialize<mojom::FilePath>(file, file_out));
ASSERT_EQ(file, file_out);
}

Expand Down
Loading

0 comments on commit b01e68c

Please sign in to comment.