Commit bb91d09d authored by Oleh Lamzin's avatar Oleh Lamzin Committed by Commit Bot

[Telemetry SWX] reorder browsertest support class methods

Reorder methods in telemetry_extension_ui_browsertest.h/.cc based on
following rules:
1. Most important methods first;
2. Methods in .cc are in the same order as they are in .h.

Bug: b:158566609
Change-Id: If8b3e9a1518735bbfa2e83c8703647221760dc1a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2387023
Commit-Queue: Oleh Lamzin <lamzin@google.com>
Reviewed-by: default avatarMahmoud Gawad <mgawad@google.com>
Cr-Commit-Position: refs/heads/master@{#803671}
parent 318758c5
...@@ -62,52 +62,6 @@ void TelemetryExtensionUiBrowserTest::SetUpCommandLine( ...@@ -62,52 +62,6 @@ void TelemetryExtensionUiBrowserTest::SetUpCommandLine(
SandboxedWebUiAppTestBase::SetUpCommandLine(command_line); SandboxedWebUiAppTestBase::SetUpCommandLine(command_line);
} }
void TelemetryExtensionUiBrowserTest::
ConfigureDiagnosticsForInteractiveUpdate() {
namespace cros_healthd = ::chromeos::cros_healthd::mojom;
auto input = cros_healthd::RoutineUpdate::New();
auto routineUpdateUnion = cros_healthd::RoutineUpdateUnion::New();
auto interactiveRoutineUpdate = cros_healthd::InteractiveRoutineUpdate::New();
interactiveRoutineUpdate->user_message =
cros_healthd::DiagnosticRoutineUserMessageEnum::kUnplugACPower;
routineUpdateUnion->set_interactive_update(
std::move(interactiveRoutineUpdate));
input->progress_percent = 0;
input->output = chromeos::MojoUtils::CreateReadOnlySharedMemoryMojoHandle(
"This routine is running!");
input->routine_update_union = std::move(routineUpdateUnion);
chromeos::cros_healthd::FakeCrosHealthdClient::Get()
->SetGetRoutineUpdateResponseForTesting(input);
}
void TelemetryExtensionUiBrowserTest::
ConfigureDiagnosticsForNonInteractiveUpdate() {
namespace cros_healthd = ::chromeos::cros_healthd::mojom;
auto input = cros_healthd::RoutineUpdate::New();
auto routineUpdateUnion = cros_healthd::RoutineUpdateUnion::New();
auto nonInteractiveRoutineUpdate =
cros_healthd::NonInteractiveRoutineUpdate::New();
nonInteractiveRoutineUpdate->status =
cros_healthd::DiagnosticRoutineStatusEnum::kReady;
nonInteractiveRoutineUpdate->status_message = "Routine ran by Google.";
routineUpdateUnion->set_noninteractive_update(
std::move(nonInteractiveRoutineUpdate));
input->progress_percent = 3147483771;
input->routine_update_union = std::move(routineUpdateUnion);
chromeos::cros_healthd::FakeCrosHealthdClient::Get()
->SetGetRoutineUpdateResponseForTesting(input);
}
void TelemetryExtensionUiBrowserTest::SetUpOnMainThread() { void TelemetryExtensionUiBrowserTest::SetUpOnMainThread() {
{ {
namespace cros_diagnostics = ::chromeos::cros_healthd::mojom; namespace cros_diagnostics = ::chromeos::cros_healthd::mojom;
...@@ -329,3 +283,49 @@ void TelemetryExtensionUiBrowserTest::SetUpOnMainThread() { ...@@ -329,3 +283,49 @@ void TelemetryExtensionUiBrowserTest::SetUpOnMainThread() {
SandboxedWebUiAppTestBase::SetUpOnMainThread(); SandboxedWebUiAppTestBase::SetUpOnMainThread();
} }
void TelemetryExtensionUiBrowserTest::
ConfigureDiagnosticsForInteractiveUpdate() {
namespace cros_healthd = ::chromeos::cros_healthd::mojom;
auto input = cros_healthd::RoutineUpdate::New();
auto routineUpdateUnion = cros_healthd::RoutineUpdateUnion::New();
auto interactiveRoutineUpdate = cros_healthd::InteractiveRoutineUpdate::New();
interactiveRoutineUpdate->user_message =
cros_healthd::DiagnosticRoutineUserMessageEnum::kUnplugACPower;
routineUpdateUnion->set_interactive_update(
std::move(interactiveRoutineUpdate));
input->progress_percent = 0;
input->output = chromeos::MojoUtils::CreateReadOnlySharedMemoryMojoHandle(
"This routine is running!");
input->routine_update_union = std::move(routineUpdateUnion);
chromeos::cros_healthd::FakeCrosHealthdClient::Get()
->SetGetRoutineUpdateResponseForTesting(input);
}
void TelemetryExtensionUiBrowserTest::
ConfigureDiagnosticsForNonInteractiveUpdate() {
namespace cros_healthd = ::chromeos::cros_healthd::mojom;
auto input = cros_healthd::RoutineUpdate::New();
auto routineUpdateUnion = cros_healthd::RoutineUpdateUnion::New();
auto nonInteractiveRoutineUpdate =
cros_healthd::NonInteractiveRoutineUpdate::New();
nonInteractiveRoutineUpdate->status =
cros_healthd::DiagnosticRoutineStatusEnum::kReady;
nonInteractiveRoutineUpdate->status_message = "Routine ran by Google.";
routineUpdateUnion->set_noninteractive_update(
std::move(nonInteractiveRoutineUpdate));
input->progress_percent = 3147483771;
input->routine_update_union = std::move(routineUpdateUnion);
chromeos::cros_healthd::FakeCrosHealthdClient::Get()
->SetGetRoutineUpdateResponseForTesting(input);
}
...@@ -18,12 +18,12 @@ class TelemetryExtensionUiBrowserTest : public SandboxedWebUiAppTestBase { ...@@ -18,12 +18,12 @@ class TelemetryExtensionUiBrowserTest : public SandboxedWebUiAppTestBase {
TelemetryExtensionUiBrowserTest& operator=( TelemetryExtensionUiBrowserTest& operator=(
const TelemetryExtensionUiBrowserTest&) = delete; const TelemetryExtensionUiBrowserTest&) = delete;
void ConfigureDiagnosticsForInteractiveUpdate();
void ConfigureDiagnosticsForNonInteractiveUpdate();
// SandboxedWebUiAppTestBase overrides: // SandboxedWebUiAppTestBase overrides:
void SetUpCommandLine(base::CommandLine* command_line) override; void SetUpCommandLine(base::CommandLine* command_line) override;
void SetUpOnMainThread() override; void SetUpOnMainThread() override;
void ConfigureDiagnosticsForInteractiveUpdate();
void ConfigureDiagnosticsForNonInteractiveUpdate();
}; };
#endif // CHROMEOS_COMPONENTS_TELEMETRY_EXTENSION_UI_TEST_TELEMETRY_EXTENSION_UI_BROWSERTEST_H_ #endif // CHROMEOS_COMPONENTS_TELEMETRY_EXTENSION_UI_TEST_TELEMETRY_EXTENSION_UI_BROWSERTEST_H_
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