Skip to content

GitLab

T
tangled
Commit f56e090c authored by Paul Moy's avatar Paul Moy Committed by Commit Bot
Browse files
Options

remote_commands: move job inside DeviceCommandRunRoutineJobTest 

Instead of having every unit test duplicate the code for
creating its own RemoteCommandJob, move this code inside
the test fixture so the logic is only needed a single time.
This also lets the fixture's methods access the job without
specifically being passed the job as an argument.

Bug: chromium:1066251
Change-Id: I2d31ba0b77246d16ee41cad6e4b0e154c716d1b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2131326Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Paul Moy <pmoy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756055}
parent 20d16a72
Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 276 deletions
chrome/browser/chromeos/policy/remote_commands/device_command_run_routine_job_unittest.cc
View file @ f56e090c
...@@ -153,10 +153,9 @@ class DeviceCommandRunRoutineJobTest : public testing::Test { ...@@ -153,10 +153,9 @@ class DeviceCommandRunRoutineJobTest : public testing::Test {
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum routine, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum routine,
base::Value params); base::Value params);
bool RunJob(RemoteCommandJob* job, bool RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum routine,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum routine,
base::Value params_dict, base::Value params_dict,
base::RepeatingClosure callback); base::RepeatingCallback<void(RemoteCommandJob*)> callback);
base::test::TaskEnvironment task_environment_{ base::test::TaskEnvironment task_environment_{
base::test::TaskEnvironment::TimeSource::MOCK_TIME}; base::test::TaskEnvironment::TimeSource::MOCK_TIME};
...@@ -197,17 +196,17 @@ void DeviceCommandRunRoutineJobTest::InitializeJob( ...@@ -197,17 +196,17 @@ void DeviceCommandRunRoutineJobTest::InitializeJob(
} }
bool DeviceCommandRunRoutineJobTest::RunJob( bool DeviceCommandRunRoutineJobTest::RunJob(
RemoteCommandJob* job,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum routine, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum routine,
base::Value params_dict, base::Value params_dict,
base::RepeatingClosure callback) { base::RepeatingCallback<void(RemoteCommandJob*)> callback) {
auto job = std::make_unique<DeviceCommandRunRoutineJob>();
InitializeJob( InitializeJob(
job, kUniqueID, test_start_time_, base::TimeDelta::FromSeconds(30), job.get(), kUniqueID, test_start_time_, base::TimeDelta::FromSeconds(30),
/*terminate_upon_input=*/false, routine, std::move(params_dict)); /*terminate_upon_input=*/false, routine, std::move(params_dict));
base::RunLoop run_loop; base::RunLoop run_loop;
bool success = job->Run(base::Time::Now(), base::TimeTicks::Now(), bool success = job->Run(base::Time::Now(), base::TimeTicks::Now(),
base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([&]() {
std::move(callback).Run(); std::move(callback).Run(job.get());
run_loop.Quit(); run_loop.Quit();
})); }));
run_loop.Run(); run_loop.Run();
...@@ -215,9 +214,8 @@ bool DeviceCommandRunRoutineJobTest::RunJob( ...@@ -215,9 +214,8 @@ bool DeviceCommandRunRoutineJobTest::RunJob(
} }
TEST_F(DeviceCommandRunRoutineJobTest, InvalidRoutineEnumInCommandPayload) { TEST_F(DeviceCommandRunRoutineJobTest, InvalidRoutineEnumInCommandPayload) {
auto job = std::make_unique<DeviceCommandRunRoutineJob>();
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_FALSE(job->Init( EXPECT_FALSE(job->Init(
base::TimeTicks::Now(), base::TimeTicks::Now(),
GenerateCommandProto( GenerateCommandProto(
...@@ -237,9 +235,8 @@ TEST_F(DeviceCommandRunRoutineJobTest, InvalidRoutineEnumInCommandPayload) { ...@@ -237,9 +235,8 @@ TEST_F(DeviceCommandRunRoutineJobTest, InvalidRoutineEnumInCommandPayload) {
// Test that not specifying a routine causes the job initialization to fail. // Test that not specifying a routine causes the job initialization to fail.
TEST_F(DeviceCommandRunRoutineJobTest, CommandPayloadMissingRoutine) { TEST_F(DeviceCommandRunRoutineJobTest, CommandPayloadMissingRoutine) {
auto job = std::make_unique<DeviceCommandRunRoutineJob>();
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_FALSE(job->Init( EXPECT_FALSE(job->Init(
base::TimeTicks::Now(), base::TimeTicks::Now(),
GenerateCommandProto(kUniqueID, base::TimeTicks::Now() - test_start_time_, GenerateCommandProto(kUniqueID, base::TimeTicks::Now() - test_start_time_,
...@@ -255,8 +252,7 @@ TEST_F(DeviceCommandRunRoutineJobTest, CommandPayloadMissingRoutine) { ...@@ -255,8 +252,7 @@ TEST_F(DeviceCommandRunRoutineJobTest, CommandPayloadMissingRoutine) {
// Test that not including a parameters dictionary causes the routine // Test that not including a parameters dictionary causes the routine
// initialization to fail. // initialization to fail.
TEST_F(DeviceCommandRunRoutineJobTest, CommandPayloadMissingParamDict) { TEST_F(DeviceCommandRunRoutineJobTest, CommandPayloadMissingParamDict) {
std::unique_ptr<RemoteCommandJob> job = auto job = std::make_unique<DeviceCommandRunRoutineJob>();
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_FALSE(job->Init( EXPECT_FALSE(job->Init(
base::TimeTicks::Now(), base::TimeTicks::Now(),
GenerateCommandProto( GenerateCommandProto(
...@@ -279,12 +275,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunBatteryCapacityRoutineSuccess) { ...@@ -279,12 +275,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunBatteryCapacityRoutineSuccess) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLowMahFieldName, /*low_mah=*/90812); params_dict.SetIntKey(kLowMahFieldName, /*low_mah=*/90812);
params_dict.SetIntKey(kHighMahFieldName, /*high_mah=*/986909); params_dict.SetIntKey(kHighMahFieldName, /*high_mah=*/986909);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryCapacity, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryCapacity,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -297,12 +291,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunBatteryCapacityRoutineSuccess) { ...@@ -297,12 +291,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunBatteryCapacityRoutineSuccess) {
TEST_F(DeviceCommandRunRoutineJobTest, RunBatteryCapacityRoutineMissingLowMah) { TEST_F(DeviceCommandRunRoutineJobTest, RunBatteryCapacityRoutineMissingLowMah) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kHighMahFieldName, /*high_mah=*/986909); params_dict.SetIntKey(kHighMahFieldName, /*high_mah=*/986909);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryCapacity, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryCapacity,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -316,12 +308,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -316,12 +308,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
RunBatteryCapacityRoutineMissingHighMah) { RunBatteryCapacityRoutineMissingHighMah) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLowMahFieldName, /*low_mah=*/90812); params_dict.SetIntKey(kLowMahFieldName, /*low_mah=*/90812);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryCapacity, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryCapacity,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -335,12 +325,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunBatteryCapacityRoutineInvalidLowMah) { ...@@ -335,12 +325,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunBatteryCapacityRoutineInvalidLowMah) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLowMahFieldName, /*low_mah=*/-1); params_dict.SetIntKey(kLowMahFieldName, /*low_mah=*/-1);
params_dict.SetIntKey(kHighMahFieldName, /*high_mah=*/986909); params_dict.SetIntKey(kHighMahFieldName, /*high_mah=*/986909);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryCapacity, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryCapacity,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -355,12 +343,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -355,12 +343,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLowMahFieldName, /*low_mah=*/90812); params_dict.SetIntKey(kLowMahFieldName, /*low_mah=*/90812);
params_dict.SetIntKey(kHighMahFieldName, /*high_mah=*/-1); params_dict.SetIntKey(kHighMahFieldName, /*high_mah=*/-1);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryCapacity, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryCapacity,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -378,12 +364,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunBatteryHealthRoutineSuccess) { ...@@ -378,12 +364,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunBatteryHealthRoutineSuccess) {
/*maximum_cycle_count=*/12); /*maximum_cycle_count=*/12);
params_dict.SetIntKey(kPercentBatteryWearAllowedFieldName, params_dict.SetIntKey(kPercentBatteryWearAllowedFieldName,
/*percent_battery_wear_allowed=*/78); /*percent_battery_wear_allowed=*/78);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryHealth, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryHealth,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -398,12 +382,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -398,12 +382,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kPercentBatteryWearAllowedFieldName, params_dict.SetIntKey(kPercentBatteryWearAllowedFieldName,
/*percent_battery_wear_allowed=*/78); /*percent_battery_wear_allowed=*/78);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryHealth, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryHealth,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -418,12 +400,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -418,12 +400,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kMaximumCycleCountFieldName, params_dict.SetIntKey(kMaximumCycleCountFieldName,
/*maximum_cycle_count=*/12); /*maximum_cycle_count=*/12);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryHealth, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryHealth,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -440,12 +420,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -440,12 +420,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
/*maximum_cycle_count=*/-1); /*maximum_cycle_count=*/-1);
params_dict.SetIntKey(kPercentBatteryWearAllowedFieldName, params_dict.SetIntKey(kPercentBatteryWearAllowedFieldName,
/*percent_battery_wear_allowed=*/78); /*percent_battery_wear_allowed=*/78);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryHealth, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryHealth,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -462,12 +440,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -462,12 +440,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
/*maximum_cycle_count=*/12); /*maximum_cycle_count=*/12);
params_dict.SetIntKey(kPercentBatteryWearAllowedFieldName, params_dict.SetIntKey(kPercentBatteryWearAllowedFieldName,
/*percent_battery_wear_allowed=*/-1); /*percent_battery_wear_allowed=*/-1);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryHealth, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryHealth,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -483,11 +459,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunUrandomRoutineSuccess) { ...@@ -483,11 +459,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunUrandomRoutineSuccess) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLengthSecondsFieldName, params_dict.SetIntKey(kLengthSecondsFieldName,
/*length_seconds=*/2342); /*length_seconds=*/2342);
std::unique_ptr<RemoteCommandJob> job = EXPECT_TRUE(
std::make_unique<DeviceCommandRunRoutineJob>(); RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kUrandom,
EXPECT_TRUE(RunJob( std::move(params_dict),
job.get(), chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kUrandom, base::BindLambdaForTesting([](RemoteCommandJob* job) {
std::move(params_dict), base::BindLambdaForTesting([&]() {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -499,11 +474,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunUrandomRoutineSuccess) { ...@@ -499,11 +474,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunUrandomRoutineSuccess) {
// to fail. // to fail.
TEST_F(DeviceCommandRunRoutineJobTest, RunUrandomRoutineMissingLengthSeconds) { TEST_F(DeviceCommandRunRoutineJobTest, RunUrandomRoutineMissingLengthSeconds) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
std::unique_ptr<RemoteCommandJob> job = EXPECT_TRUE(
std::make_unique<DeviceCommandRunRoutineJob>(); RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kUrandom,
EXPECT_TRUE(RunJob( std::move(params_dict),
job.get(), chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kUrandom, base::BindLambdaForTesting([](RemoteCommandJob* job) {
std::move(params_dict), base::BindLambdaForTesting([&]() {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -517,11 +491,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunUrandomRoutineInvalidLengthSeconds) { ...@@ -517,11 +491,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunUrandomRoutineInvalidLengthSeconds) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLengthSecondsFieldName, params_dict.SetIntKey(kLengthSecondsFieldName,
/*length_seconds=*/-1); /*length_seconds=*/-1);
std::unique_ptr<RemoteCommandJob> job = EXPECT_TRUE(
std::make_unique<DeviceCommandRunRoutineJob>(); RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kUrandom,
EXPECT_TRUE(RunJob( std::move(params_dict),
job.get(), chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kUrandom, base::BindLambdaForTesting([](RemoteCommandJob* job) {
std::move(params_dict), base::BindLambdaForTesting([&]() {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -537,12 +510,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunSmartctlCheckRoutineSuccess) { ...@@ -537,12 +510,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunSmartctlCheckRoutineSuccess) {
chromeos::cros_healthd::FakeCrosHealthdClient::Get() chromeos::cros_healthd::FakeCrosHealthdClient::Get()
->SetRunRoutineResponseForTesting(run_routine_response); ->SetRunRoutineResponseForTesting(run_routine_response);
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kSmartctlCheck, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kSmartctlCheck,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -563,11 +534,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunAcPowerRoutineSuccess) { ...@@ -563,11 +534,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunAcPowerRoutineSuccess) {
chromeos::cros_healthd::mojom::AcPowerStatusEnum::kConnected)); chromeos::cros_healthd::mojom::AcPowerStatusEnum::kConnected));
params_dict.SetStringKey(kExpectedPowerTypeFieldName, params_dict.SetStringKey(kExpectedPowerTypeFieldName,
/*expected_power_type=*/"power_type"); /*expected_power_type=*/"power_type");
std::unique_ptr<RemoteCommandJob> job = EXPECT_TRUE(
std::make_unique<DeviceCommandRunRoutineJob>(); RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kAcPower,
EXPECT_TRUE(RunJob( std::move(params_dict),
job.get(), chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kAcPower, base::BindLambdaForTesting([](RemoteCommandJob* job) {
std::move(params_dict), base::BindLambdaForTesting([&]() {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -588,11 +558,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -588,11 +558,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
kExpectedStatusFieldName, kExpectedStatusFieldName,
/*expected_status=*/static_cast<int>( /*expected_status=*/static_cast<int>(
chromeos::cros_healthd::mojom::AcPowerStatusEnum::kConnected)); chromeos::cros_healthd::mojom::AcPowerStatusEnum::kConnected));
std::unique_ptr<RemoteCommandJob> job = EXPECT_TRUE(
std::make_unique<DeviceCommandRunRoutineJob>(); RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kAcPower,
EXPECT_TRUE(RunJob( std::move(params_dict),
job.get(), chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kAcPower, base::BindLambdaForTesting([](RemoteCommandJob* job) {
std::move(params_dict), base::BindLambdaForTesting([&]() {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -606,11 +575,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunAcPowerRoutineMissingExpectedStatus) { ...@@ -606,11 +575,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunAcPowerRoutineMissingExpectedStatus) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetStringKey(kExpectedPowerTypeFieldName, params_dict.SetStringKey(kExpectedPowerTypeFieldName,
/*expected_power_type=*/"power_type"); /*expected_power_type=*/"power_type");
std::unique_ptr<RemoteCommandJob> job = EXPECT_TRUE(
std::make_unique<DeviceCommandRunRoutineJob>(); RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kAcPower,
EXPECT_TRUE(RunJob( std::move(params_dict),
job.get(), chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kAcPower, base::BindLambdaForTesting([](RemoteCommandJob* job) {
std::move(params_dict), base::BindLambdaForTesting([&]() {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -630,11 +598,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunAcPowerRoutineInvalidExpectedStatus) { ...@@ -630,11 +598,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunAcPowerRoutineInvalidExpectedStatus) {
static_cast<int>(expected_status)); static_cast<int>(expected_status));
params_dict.SetStringKey(kExpectedPowerTypeFieldName, params_dict.SetStringKey(kExpectedPowerTypeFieldName,
/*expected_power_type=*/"power_type"); /*expected_power_type=*/"power_type");
std::unique_ptr<RemoteCommandJob> job = EXPECT_TRUE(
std::make_unique<DeviceCommandRunRoutineJob>(); RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kAcPower,
EXPECT_TRUE(RunJob( std::move(params_dict),
job.get(), chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kAcPower, base::BindLambdaForTesting([](RemoteCommandJob* job) {
std::move(params_dict), base::BindLambdaForTesting([&]() {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -650,12 +617,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunCpuCacheRoutineSuccess) { ...@@ -650,12 +617,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunCpuCacheRoutineSuccess) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLengthSecondsFieldName, params_dict.SetIntKey(kLengthSecondsFieldName,
/*length_seconds=*/2342); /*length_seconds=*/2342);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kCpuCache,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kCpuCache, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -667,12 +632,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunCpuCacheRoutineSuccess) { ...@@ -667,12 +632,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunCpuCacheRoutineSuccess) {
// routine to fail. // routine to fail.
TEST_F(DeviceCommandRunRoutineJobTest, RunCpuCacheRoutineMissingLengthSeconds) { TEST_F(DeviceCommandRunRoutineJobTest, RunCpuCacheRoutineMissingLengthSeconds) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kCpuCache,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kCpuCache, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -686,12 +649,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunCpuCacheRoutineInvalidLengthSeconds) { ...@@ -686,12 +649,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunCpuCacheRoutineInvalidLengthSeconds) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLengthSecondsFieldName, params_dict.SetIntKey(kLengthSecondsFieldName,
/*length_seconds=*/-1); /*length_seconds=*/-1);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kCpuCache,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kCpuCache, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -707,12 +668,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunCpuStressRoutineSuccess) { ...@@ -707,12 +668,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunCpuStressRoutineSuccess) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLengthSecondsFieldName, params_dict.SetIntKey(kLengthSecondsFieldName,
/*length_seconds=*/2342); /*length_seconds=*/2342);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kCpuStress,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kCpuStress, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -725,12 +684,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunCpuStressRoutineSuccess) { ...@@ -725,12 +684,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunCpuStressRoutineSuccess) {
TEST_F(DeviceCommandRunRoutineJobTest, TEST_F(DeviceCommandRunRoutineJobTest,
RunCpuStressRoutineMissingLengthSeconds) { RunCpuStressRoutineMissingLengthSeconds) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kCpuStress,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kCpuStress, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -745,12 +702,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -745,12 +702,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLengthSecondsFieldName, params_dict.SetIntKey(kLengthSecondsFieldName,
/*length_seconds=*/-1); /*length_seconds=*/-1);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kCpuStress,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kCpuStress, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -766,12 +721,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunFloatingPointAccuracyRoutineSuccess) { ...@@ -766,12 +721,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunFloatingPointAccuracyRoutineSuccess) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLengthSecondsFieldName, params_dict.SetIntKey(kLengthSecondsFieldName,
/*length_seconds=*/2342); /*length_seconds=*/2342);
std::unique_ptr<RemoteCommandJob> job = EXPECT_TRUE(RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob(job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::
kFloatingPointAccuracy, kFloatingPointAccuracy,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = std::unique_ptr<std::string> payload =
job->GetResultPayload(); job->GetResultPayload();
...@@ -785,13 +738,11 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunFloatingPointAccuracyRoutineSuccess) { ...@@ -785,13 +738,11 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunFloatingPointAccuracyRoutineSuccess) {
TEST_F(DeviceCommandRunRoutineJobTest, TEST_F(DeviceCommandRunRoutineJobTest,
RunFloatingPointAccuracyRoutineMissingLengthSeconds) { RunFloatingPointAccuracyRoutineMissingLengthSeconds) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::
kFloatingPointAccuracy, kFloatingPointAccuracy,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -806,13 +757,11 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -806,13 +757,11 @@ TEST_F(DeviceCommandRunRoutineJobTest,
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLengthSecondsFieldName, params_dict.SetIntKey(kLengthSecondsFieldName,
/*length_seconds=*/-1); /*length_seconds=*/-1);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::
kFloatingPointAccuracy, kFloatingPointAccuracy,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -828,12 +777,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunNvmeWearLevelRoutineSuccess) { ...@@ -828,12 +777,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunNvmeWearLevelRoutineSuccess) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kWearLevelThresholdFieldName, params_dict.SetIntKey(kWearLevelThresholdFieldName,
/*wear_level_threshold=*/50); /*wear_level_threshold=*/50);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kNvmeWearLevel, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kNvmeWearLevel,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -846,12 +793,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunNvmeWearLevelRoutineSuccess) { ...@@ -846,12 +793,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunNvmeWearLevelRoutineSuccess) {
TEST_F(DeviceCommandRunRoutineJobTest, TEST_F(DeviceCommandRunRoutineJobTest,
RunNvmeWearLevelRoutineMissingWearLevelThreshold) { RunNvmeWearLevelRoutineMissingWearLevelThreshold) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kNvmeWearLevel, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kNvmeWearLevel,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -866,12 +811,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -866,12 +811,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kWearLevelThresholdFieldName, params_dict.SetIntKey(kWearLevelThresholdFieldName,
/*wear_level_threshold=*/-1); /*wear_level_threshold=*/-1);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kNvmeWearLevel, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kNvmeWearLevel,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -889,12 +832,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunNvmeSelfTestRoutineSuccess) { ...@@ -889,12 +832,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunNvmeSelfTestRoutineSuccess) {
kNvmeSelfTestTypeFieldName, kNvmeSelfTestTypeFieldName,
/*nvme_self_test_type=*/static_cast<int>( /*nvme_self_test_type=*/static_cast<int>(
chromeos::cros_healthd::mojom::NvmeSelfTestTypeEnum::kShortSelfTest)); chromeos::cros_healthd::mojom::NvmeSelfTestTypeEnum::kShortSelfTest));
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kNvmeSelfTest, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kNvmeSelfTest,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -907,12 +848,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunNvmeSelfTestRoutineSuccess) { ...@@ -907,12 +848,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunNvmeSelfTestRoutineSuccess) {
TEST_F(DeviceCommandRunRoutineJobTest, TEST_F(DeviceCommandRunRoutineJobTest,
RunNvmeSelfTestRoutineMissingSelfTestType) { RunNvmeSelfTestRoutineMissingSelfTestType) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kNvmeSelfTest, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kNvmeSelfTest,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -929,12 +868,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -929,12 +868,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
chromeos::cros_healthd::mojom::NvmeSelfTestTypeEnum>::type>::max(); chromeos::cros_healthd::mojom::NvmeSelfTestTypeEnum>::type>::max();
params_dict.SetIntKey(kNvmeSelfTestTypeFieldName, params_dict.SetIntKey(kNvmeSelfTestTypeFieldName,
static_cast<int>(nvme_self_test_type)); static_cast<int>(nvme_self_test_type));
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kNvmeSelfTest, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kNvmeSelfTest,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -957,12 +894,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineSuccess) { ...@@ -957,12 +894,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineSuccess) {
/*length_seconds=*/2342); /*length_seconds=*/2342);
params_dict.SetIntKey(kFileSizeMbFieldName, params_dict.SetIntKey(kFileSizeMbFieldName,
/*file_size_mb=*/512); /*file_size_mb=*/512);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -978,12 +913,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineMissingType) { ...@@ -978,12 +913,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineMissingType) {
/*length_seconds=*/2342); /*length_seconds=*/2342);
params_dict.SetIntKey(kFileSizeMbFieldName, params_dict.SetIntKey(kFileSizeMbFieldName,
/*file_size_mb=*/512); /*file_size_mb=*/512);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1001,12 +934,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineMissingLengthSeconds) { ...@@ -1001,12 +934,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineMissingLengthSeconds) {
chromeos::cros_healthd::mojom::DiskReadRoutineTypeEnum::kLinearRead)); chromeos::cros_healthd::mojom::DiskReadRoutineTypeEnum::kLinearRead));
params_dict.SetIntKey(kFileSizeMbFieldName, params_dict.SetIntKey(kFileSizeMbFieldName,
/*file_size_mb=*/512); /*file_size_mb=*/512);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1024,12 +955,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineMissingFileSizeMb) { ...@@ -1024,12 +955,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineMissingFileSizeMb) {
chromeos::cros_healthd::mojom::DiskReadRoutineTypeEnum::kLinearRead)); chromeos::cros_healthd::mojom::DiskReadRoutineTypeEnum::kLinearRead));
params_dict.SetIntKey(kLengthSecondsFieldName, params_dict.SetIntKey(kLengthSecondsFieldName,
/*length_seconds=*/2342); /*length_seconds=*/2342);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1051,12 +980,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineInvalidType) { ...@@ -1051,12 +980,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineInvalidType) {
/*length_seconds=*/2342); /*length_seconds=*/2342);
params_dict.SetIntKey(kFileSizeMbFieldName, params_dict.SetIntKey(kFileSizeMbFieldName,
/*file_size_mb=*/512); /*file_size_mb=*/512);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1076,12 +1003,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineInvalidLengthSeconds) { ...@@ -1076,12 +1003,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineInvalidLengthSeconds) {
/*length_seconds=*/-1); /*length_seconds=*/-1);
params_dict.SetIntKey(kFileSizeMbFieldName, params_dict.SetIntKey(kFileSizeMbFieldName,
/*file_size_mb=*/512); /*file_size_mb=*/512);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1101,12 +1026,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineInvalidFileSizeMb) { ...@@ -1101,12 +1026,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunDiskReadRoutineInvalidFileSizeMb) {
/*length_seconds=*/2342); /*length_seconds=*/2342);
params_dict.SetIntKey(kFileSizeMbFieldName, params_dict.SetIntKey(kFileSizeMbFieldName,
/*file_size_mb=*/-1); /*file_size_mb=*/-1);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kDiskRead, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1125,12 +1048,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunPrimeSearchRoutineSuccess) { ...@@ -1125,12 +1048,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunPrimeSearchRoutineSuccess) {
/*length_seconds=*/2342); /*length_seconds=*/2342);
params_dict.SetIntKey(kMaxNumFieldName, params_dict.SetIntKey(kMaxNumFieldName,
/*max_num=*/100000); /*max_num=*/100000);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kPrimeSearch,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kPrimeSearch, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1145,12 +1066,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -1145,12 +1066,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kMaxNumFieldName, params_dict.SetIntKey(kMaxNumFieldName,
/*max_num=*/100000); /*max_num=*/100000);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kPrimeSearch,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kPrimeSearch, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1164,12 +1083,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunPrimeSearchRoutineMissingMaxNum) { ...@@ -1164,12 +1083,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunPrimeSearchRoutineMissingMaxNum) {
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLengthSecondsFieldName, params_dict.SetIntKey(kLengthSecondsFieldName,
/*length_seconds=*/2342); /*length_seconds=*/2342);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kPrimeSearch,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kPrimeSearch, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1186,12 +1103,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -1186,12 +1103,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
/*length_seconds=*/-1); /*length_seconds=*/-1);
params_dict.SetIntKey(kMaxNumFieldName, params_dict.SetIntKey(kMaxNumFieldName,
/*max_num=*/100000); /*max_num=*/100000);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kPrimeSearch,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kPrimeSearch, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1207,12 +1122,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunPrimeSearchRoutineInvalidMaxNum) { ...@@ -1207,12 +1122,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunPrimeSearchRoutineInvalidMaxNum) {
/*length_seconds=*/2342); /*length_seconds=*/2342);
params_dict.SetIntKey(kMaxNumFieldName, params_dict.SetIntKey(kMaxNumFieldName,
/*max_num=*/-1); /*max_num=*/-1);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE( EXPECT_TRUE(
RunJob(job.get(), RunJob(chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kPrimeSearch,
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kPrimeSearch, std::move(params_dict),
std::move(params_dict), base::BindLambdaForTesting([&]() { base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1229,12 +1142,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunBatteryDischargeRoutineSuccess) { ...@@ -1229,12 +1142,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, RunBatteryDischargeRoutineSuccess) {
params_dict.SetIntKey(kLengthSecondsFieldName, /*length_seconds=*/10); params_dict.SetIntKey(kLengthSecondsFieldName, /*length_seconds=*/10);
params_dict.SetIntKey(kMaximumDischargePercentAllowedFieldName, params_dict.SetIntKey(kMaximumDischargePercentAllowedFieldName,
/*maximum_discharge_percent_allowed=*/76); /*maximum_discharge_percent_allowed=*/76);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryDischarge, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryDischarge,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED); EXPECT_EQ(job->status(), RemoteCommandJob::SUCCEEDED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1249,12 +1160,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -1249,12 +1160,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kMaximumDischargePercentAllowedFieldName, params_dict.SetIntKey(kMaximumDischargePercentAllowedFieldName,
/*maximum_discharge_percent_allowed=*/76); /*maximum_discharge_percent_allowed=*/76);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryDischarge, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryDischarge,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1268,12 +1177,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -1268,12 +1177,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
// the routine to fail. // the routine to fail.
base::Value params_dict(base::Value::Type::DICTIONARY); base::Value params_dict(base::Value::Type::DICTIONARY);
params_dict.SetIntKey(kLengthSecondsFieldName, /*length_seconds=*/10); params_dict.SetIntKey(kLengthSecondsFieldName, /*length_seconds=*/10);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryDischarge, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryDischarge,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1288,12 +1195,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -1288,12 +1195,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
params_dict.SetIntKey(kLengthSecondsFieldName, /*length_seconds=*/-10); params_dict.SetIntKey(kLengthSecondsFieldName, /*length_seconds=*/-10);
params_dict.SetIntKey(kMaximumDischargePercentAllowedFieldName, params_dict.SetIntKey(kMaximumDischargePercentAllowedFieldName,
/*maximum_discharge_percent_allowed=*/76); /*maximum_discharge_percent_allowed=*/76);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryDischarge, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryDischarge,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
...@@ -1309,12 +1214,10 @@ TEST_F(DeviceCommandRunRoutineJobTest, ...@@ -1309,12 +1214,10 @@ TEST_F(DeviceCommandRunRoutineJobTest,
params_dict.SetIntKey(kLengthSecondsFieldName, /*length_seconds=*/10); params_dict.SetIntKey(kLengthSecondsFieldName, /*length_seconds=*/10);
params_dict.SetIntKey(kMaximumDischargePercentAllowedFieldName, params_dict.SetIntKey(kMaximumDischargePercentAllowedFieldName,
/*maximum_discharge_percent_allowed=*/-76); /*maximum_discharge_percent_allowed=*/-76);
std::unique_ptr<RemoteCommandJob> job =
std::make_unique<DeviceCommandRunRoutineJob>();
EXPECT_TRUE(RunJob( EXPECT_TRUE(RunJob(
job.get(),
chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryDischarge, chromeos::cros_healthd::mojom::DiagnosticRoutineEnum::kBatteryDischarge,
std::move(params_dict), base::BindLambdaForTesting([&]() { std::move(params_dict),
base::BindLambdaForTesting([](RemoteCommandJob* job) {
EXPECT_EQ(job->status(), RemoteCommandJob::FAILED); EXPECT_EQ(job->status(), RemoteCommandJob::FAILED);
std::unique_ptr<std::string> payload = job->GetResultPayload(); std::unique_ptr<std::string> payload = job->GetResultPayload();
EXPECT_TRUE(payload); EXPECT_TRUE(payload);
......
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