Commit 6cfd1820 authored by Oleh Lamzin's avatar Oleh Lamzin Committed by Commit Bot

[Telemetry SWX] Use move instead of Clone in tests

Use std::move instead of Clone in tests.

Bug: b:158658869
Change-Id: I364510d8dc36cf2a324b8fa06a23dcd3aa47269c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2277988
Commit-Queue: Oleh Lamzin <lamzin@google.com>
Reviewed-by: default avatarMahmoud Gawad <mgawad@google.com>
Reviewed-by: default avatarRoland Bock <rbock@google.com>
Cr-Commit-Position: refs/heads/master@{#786403}
parent 58d7cd3e
...@@ -242,16 +242,10 @@ TEST(ProbeServiceConvertors, NonRemovableBlockDeviceResultPtrError) { ...@@ -242,16 +242,10 @@ TEST(ProbeServiceConvertors, NonRemovableBlockDeviceResultPtrError) {
TEST(ProbeServiceConvertors, CachedVpdInfoPtr) { TEST(ProbeServiceConvertors, CachedVpdInfoPtr) {
constexpr char kSkuNumber[] = "sku-1"; constexpr char kSkuNumber[] = "sku-1";
// Here we don't use cros_healthd::mojom::CachedVpdInfo::New auto input = cros_healthd::mojom::CachedVpdInfo::New();
// because CachedVpdInfo may contain some fields that we input->sku_number = kSkuNumber;
// don't use yet.
auto info = cros_healthd::mojom::CachedVpdInfo::New();
info->sku_number = kSkuNumber;
// Here we intentionaly use health::mojom::CachedVpdInfo::New EXPECT_EQ(ConvertPtr(std::move(input)),
// not to forget to test new fields.
EXPECT_EQ(ConvertPtr(info.Clone()),
health::mojom::CachedVpdInfo::New(kSkuNumber)); health::mojom::CachedVpdInfo::New(kSkuNumber));
} }
...@@ -279,7 +273,7 @@ TEST(ProbeServiceConvertors, CpuCStateInfoPtr) { ...@@ -279,7 +273,7 @@ TEST(ProbeServiceConvertors, CpuCStateInfoPtr) {
input->time_in_state_since_last_boot_us = kTimeInStateSinceLastBootUs; input->time_in_state_since_last_boot_us = kTimeInStateSinceLastBootUs;
} }
const auto output = ConvertPtr(input.Clone()); const auto output = ConvertPtr(std::move(input));
ASSERT_TRUE(output); ASSERT_TRUE(output);
EXPECT_EQ(output->name, kName); EXPECT_EQ(output->name, kName);
EXPECT_EQ(output->time_in_state_since_last_boot_us, EXPECT_EQ(output->time_in_state_since_last_boot_us,
...@@ -306,7 +300,7 @@ TEST(ProbeServiceConvertors, LogicalCpuInfoPtr) { ...@@ -306,7 +300,7 @@ TEST(ProbeServiceConvertors, LogicalCpuInfoPtr) {
input->c_states.push_back(std::move(c_state)); input->c_states.push_back(std::move(c_state));
} }
const auto output = ConvertPtr(input.Clone()); const auto output = ConvertPtr(std::move(input));
ASSERT_TRUE(output); ASSERT_TRUE(output);
EXPECT_EQ(output->max_clock_speed_khz, EXPECT_EQ(output->max_clock_speed_khz,
health::mojom::UInt32Value::New(kMaxClockSpeedKhz)); health::mojom::UInt32Value::New(kMaxClockSpeedKhz));
...@@ -334,7 +328,7 @@ TEST(ProbeServiceConvertors, PhysicalCpuInfoPtr) { ...@@ -334,7 +328,7 @@ TEST(ProbeServiceConvertors, PhysicalCpuInfoPtr) {
input->logical_cpus.push_back(std::move(logical_info)); input->logical_cpus.push_back(std::move(logical_info));
} }
const auto output = ConvertPtr(input.Clone()); const auto output = ConvertPtr(std::move(input));
ASSERT_TRUE(output); ASSERT_TRUE(output);
ASSERT_EQ(output->model_name, kModelName); ASSERT_EQ(output->model_name, kModelName);
ASSERT_EQ(output->logical_cpus.size(), 1ULL); ASSERT_EQ(output->logical_cpus.size(), 1ULL);
...@@ -367,7 +361,7 @@ TEST(ProbeServiceConvertors, CpuInfoPtr) { ...@@ -367,7 +361,7 @@ TEST(ProbeServiceConvertors, CpuInfoPtr) {
input->physical_cpus.push_back(std::move(physical_info)); input->physical_cpus.push_back(std::move(physical_info));
} }
const auto output = ConvertPtr(input.Clone()); const auto output = ConvertPtr(std::move(input));
ASSERT_TRUE(output); ASSERT_TRUE(output);
ASSERT_EQ(output->num_total_threads, ASSERT_EQ(output->num_total_threads,
health::mojom::UInt32Value::New(kNumTotalThreads)); health::mojom::UInt32Value::New(kNumTotalThreads));
...@@ -398,7 +392,7 @@ TEST(ProbeServiceConvertors, TimezoneInfoPtr) { ...@@ -398,7 +392,7 @@ TEST(ProbeServiceConvertors, TimezoneInfoPtr) {
input->posix = kPosix; input->posix = kPosix;
input->region = kRegion; input->region = kRegion;
const auto output = ConvertPtr(input.Clone()); const auto output = ConvertPtr(std::move(input));
ASSERT_TRUE(output); ASSERT_TRUE(output);
EXPECT_EQ(output->posix, kPosix); EXPECT_EQ(output->posix, kPosix);
EXPECT_EQ(output->region, kRegion); EXPECT_EQ(output->region, kRegion);
...@@ -430,7 +424,7 @@ TEST(ProbeServiceConvertors, MemoryInfoPtr) { ...@@ -430,7 +424,7 @@ TEST(ProbeServiceConvertors, MemoryInfoPtr) {
input->available_memory_kib = kAvailableMemoryKib; input->available_memory_kib = kAvailableMemoryKib;
input->page_faults_since_last_boot = kPageFaultsSinceLastBoot; input->page_faults_since_last_boot = kPageFaultsSinceLastBoot;
const auto output = ConvertPtr(input.Clone()); const auto output = ConvertPtr(std::move(input));
ASSERT_TRUE(output); ASSERT_TRUE(output);
EXPECT_EQ(output->total_memory_kib, EXPECT_EQ(output->total_memory_kib,
health::mojom::UInt32Value::New(kTotalMemoryKib)); health::mojom::UInt32Value::New(kTotalMemoryKib));
...@@ -466,7 +460,7 @@ TEST(ProbeServiceConvertors, BacklightInfoPtr) { ...@@ -466,7 +460,7 @@ TEST(ProbeServiceConvertors, BacklightInfoPtr) {
input->max_brightness = kMaxBrightness; input->max_brightness = kMaxBrightness;
input->brightness = kBrightness; input->brightness = kBrightness;
const auto output = ConvertPtr(input.Clone()); const auto output = ConvertPtr(std::move(input));
ASSERT_TRUE(output); ASSERT_TRUE(output);
EXPECT_EQ(output->path, kPath); EXPECT_EQ(output->path, kPath);
EXPECT_EQ(output->max_brightness, EXPECT_EQ(output->max_brightness,
...@@ -489,7 +483,7 @@ TEST(ProbeServiceConvertors, BacklightResultPtrInfo) { ...@@ -489,7 +483,7 @@ TEST(ProbeServiceConvertors, BacklightResultPtrInfo) {
std::move(backlight_infos)); std::move(backlight_infos));
} }
const auto output = ConvertPtr(input.Clone()); const auto output = ConvertPtr(std::move(input));
ASSERT_TRUE(output); ASSERT_TRUE(output);
ASSERT_TRUE(output->is_backlight_info()); ASSERT_TRUE(output->is_backlight_info());
...@@ -512,7 +506,7 @@ TEST(ProbeServiceConvertors, FanInfoPtr) { ...@@ -512,7 +506,7 @@ TEST(ProbeServiceConvertors, FanInfoPtr) {
auto input = cros_healthd::mojom::FanInfo::New(); auto input = cros_healthd::mojom::FanInfo::New();
input->speed_rpm = kSpeedRpm; input->speed_rpm = kSpeedRpm;
const auto output = ConvertPtr(input.Clone()); const auto output = ConvertPtr(std::move(input));
ASSERT_TRUE(output); ASSERT_TRUE(output);
EXPECT_EQ(output->speed_rpm, health::mojom::UInt32Value::New(kSpeedRpm)); EXPECT_EQ(output->speed_rpm, health::mojom::UInt32Value::New(kSpeedRpm));
} }
...@@ -531,7 +525,7 @@ TEST(ProbeServiceConvertors, FanResultPtrInfo) { ...@@ -531,7 +525,7 @@ TEST(ProbeServiceConvertors, FanResultPtrInfo) {
input = cros_healthd::mojom::FanResult::NewFanInfo(std::move(fan_infos)); input = cros_healthd::mojom::FanResult::NewFanInfo(std::move(fan_infos));
} }
const auto output = ConvertPtr(input.Clone()); const auto output = ConvertPtr(std::move(input));
ASSERT_TRUE(output); ASSERT_TRUE(output);
ASSERT_TRUE(output->is_fan_info()); ASSERT_TRUE(output->is_fan_info());
...@@ -559,7 +553,7 @@ TEST(ProbeServiceConvertors, StatefulPartitionInfoPtr) { ...@@ -559,7 +553,7 @@ TEST(ProbeServiceConvertors, StatefulPartitionInfoPtr) {
input->available_space = kAvailableSpace; input->available_space = kAvailableSpace;
input->total_space = kTotalSpace; input->total_space = kTotalSpace;
const auto output = ConvertPtr(input.Clone()); const auto output = ConvertPtr(std::move(input));
ASSERT_TRUE(output); ASSERT_TRUE(output);
EXPECT_EQ(output->available_space, EXPECT_EQ(output->available_space,
health::mojom::UInt64Value::New(kRoundedAvailableSpace)); health::mojom::UInt64Value::New(kRoundedAvailableSpace));
...@@ -616,7 +610,7 @@ TEST(ProbeServiceConvertors, BluetoothResultPtrInfo) { ...@@ -616,7 +610,7 @@ TEST(ProbeServiceConvertors, BluetoothResultPtrInfo) {
std::move(infos)); std::move(infos));
} }
const auto output = ConvertPtr(input.Clone()); const auto output = ConvertPtr(std::move(input));
ASSERT_TRUE(output); ASSERT_TRUE(output);
ASSERT_TRUE(output->is_bluetooth_adapter_info()); ASSERT_TRUE(output->is_bluetooth_adapter_info());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment