Commit 11aaf149 authored by Joon Ahn's avatar Joon Ahn Committed by Commit Bot

Diagnostics: Rename diagnostics_test_utils as dx_utils

Bug: 1125150
Test: browser_tests --gtest_filter=DiagnosticsApp*
Change-Id: I41890da092bb22dfca7c9bc92a1af0365407c16b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490548
Commit-Queue: Joon Ahn <joonbug@chromium.org>
Auto-Submit: Joon Ahn <joonbug@chromium.org>
Reviewed-by: default avatarZentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819875}
parent 07d9b3a5
...@@ -10,7 +10,7 @@ import {fakeBatteryChargeStatus, fakeBatteryHealth, fakeBatteryInfo} from 'chrom ...@@ -10,7 +10,7 @@ import {fakeBatteryChargeStatus, fakeBatteryHealth, fakeBatteryInfo} from 'chrom
import {FakeSystemDataProvider} from 'chrome://diagnostics/fake_system_data_provider.js'; import {FakeSystemDataProvider} from 'chrome://diagnostics/fake_system_data_provider.js';
import {getSystemDataProvider, setSystemDataProviderForTesting} from 'chrome://diagnostics/mojo_interface_provider.js'; import {getSystemDataProvider, setSystemDataProviderForTesting} from 'chrome://diagnostics/mojo_interface_provider.js';
import {flushTasks} from 'chrome://test/test_util.m.js'; import {flushTasks} from 'chrome://test/test_util.m.js';
import * as diagnostics_test_utils from './diagnostics_test_utils.js'; import * as dx_utils from './diagnostics_test_utils.js';
suite('BatteryStatusCardTest', () => { suite('BatteryStatusCardTest', () => {
/** @type {?HTMLElement} */ /** @type {?HTMLElement} */
...@@ -64,7 +64,7 @@ suite('BatteryStatusCardTest', () => { ...@@ -64,7 +64,7 @@ suite('BatteryStatusCardTest', () => {
fakeBatteryInfo, fakeBatteryChargeStatus, fakeBatteryHealth) fakeBatteryInfo, fakeBatteryChargeStatus, fakeBatteryHealth)
.then(() => { .then(() => {
const dataPoints = const dataPoints =
diagnostics_test_utils.getDataPointElements(batteryStatusElement); dx_utils.getDataPointElements(batteryStatusElement);
assertEquals( assertEquals(
fakeBatteryChargeStatus[0].current_now_milliamps, fakeBatteryChargeStatus[0].current_now_milliamps,
dataPoints[0].value); dataPoints[0].value);
...@@ -84,8 +84,8 @@ suite('BatteryStatusCardTest', () => { ...@@ -84,8 +84,8 @@ suite('BatteryStatusCardTest', () => {
dataPoints[5].value); dataPoints[5].value);
assertEquals(fakeBatteryHealth[0].cycle_count, dataPoints[6].value); assertEquals(fakeBatteryHealth[0].cycle_count, dataPoints[6].value);
const barChart = diagnostics_test_utils.getPercentBarChartElement( const barChart =
batteryStatusElement); dx_utils.getPercentBarChartElement(batteryStatusElement);
assertEquals( assertEquals(
fakeBatteryChargeStatus[0].charge_full_now_milliamp_hours, fakeBatteryChargeStatus[0].charge_full_now_milliamp_hours,
barChart.max); barChart.max);
......
...@@ -10,7 +10,7 @@ import {fakeCpuUsage} from 'chrome://diagnostics/fake_data.js'; ...@@ -10,7 +10,7 @@ import {fakeCpuUsage} from 'chrome://diagnostics/fake_data.js';
import {FakeSystemDataProvider} from 'chrome://diagnostics/fake_system_data_provider.js'; import {FakeSystemDataProvider} from 'chrome://diagnostics/fake_system_data_provider.js';
import {getSystemDataProvider, setSystemDataProviderForTesting} from 'chrome://diagnostics/mojo_interface_provider.js'; import {getSystemDataProvider, setSystemDataProviderForTesting} from 'chrome://diagnostics/mojo_interface_provider.js';
import {flushTasks} from 'chrome://test/test_util.m.js'; import {flushTasks} from 'chrome://test/test_util.m.js';
import * as diagnostics_test_utils from './diagnostics_test_utils.js'; import * as dx_utils from './diagnostics_test_utils.js';
suite('CpuCardTest', () => { suite('CpuCardTest', () => {
/** @type {?HTMLElement} */ /** @type {?HTMLElement} */
...@@ -56,16 +56,14 @@ suite('CpuCardTest', () => { ...@@ -56,16 +56,14 @@ suite('CpuCardTest', () => {
test('CpuCardPopulated', () => { test('CpuCardPopulated', () => {
return initializeCpuCard(fakeCpuUsage).then(() => { return initializeCpuCard(fakeCpuUsage).then(() => {
const dataPoints = const dataPoints = dx_utils.getDataPointElements(cpuElement);
diagnostics_test_utils.getDataPointElements(cpuElement);
const currentlyUsingValue = fakeCpuUsage[0].percent_usage_user + const currentlyUsingValue = fakeCpuUsage[0].percent_usage_user +
fakeCpuUsage[0].percent_usage_system; fakeCpuUsage[0].percent_usage_system;
assertEquals(currentlyUsingValue, dataPoints[0].value); assertEquals(currentlyUsingValue, dataPoints[0].value);
assertEquals( assertEquals(
fakeCpuUsage[0].cpu_temp_degrees_celcius, dataPoints[1].value); fakeCpuUsage[0].cpu_temp_degrees_celcius, dataPoints[1].value);
const cpuChart = const cpuChart = dx_utils.getRealtimeCpuChartElement(cpuElement);
diagnostics_test_utils.getRealtimeCpuChartElement(cpuElement);
assertEquals(fakeCpuUsage[0].percent_usage_user, cpuChart.user); assertEquals(fakeCpuUsage[0].percent_usage_user, cpuChart.user);
assertEquals(fakeCpuUsage[0].percent_usage_system, cpuChart.system); assertEquals(fakeCpuUsage[0].percent_usage_system, cpuChart.system);
}); });
......
...@@ -10,7 +10,7 @@ import {fakeMemoryUsage} from 'chrome://diagnostics/fake_data.js'; ...@@ -10,7 +10,7 @@ import {fakeMemoryUsage} from 'chrome://diagnostics/fake_data.js';
import {FakeSystemDataProvider} from 'chrome://diagnostics/fake_system_data_provider.js'; import {FakeSystemDataProvider} from 'chrome://diagnostics/fake_system_data_provider.js';
import {getSystemDataProvider, setSystemDataProviderForTesting} from 'chrome://diagnostics/mojo_interface_provider.js'; import {getSystemDataProvider, setSystemDataProviderForTesting} from 'chrome://diagnostics/mojo_interface_provider.js';
import {flushTasks} from 'chrome://test/test_util.m.js'; import {flushTasks} from 'chrome://test/test_util.m.js';
import * as diagnostics_test_utils from './diagnostics_test_utils.js'; import * as dx_utils from './diagnostics_test_utils.js';
suite('MemoryCardTest', () => { suite('MemoryCardTest', () => {
/** @type {?HTMLElement} */ /** @type {?HTMLElement} */
...@@ -56,14 +56,12 @@ suite('MemoryCardTest', () => { ...@@ -56,14 +56,12 @@ suite('MemoryCardTest', () => {
test('MemoryCardPopulated', () => { test('MemoryCardPopulated', () => {
return initializeMemoryCard(fakeMemoryUsage).then(() => { return initializeMemoryCard(fakeMemoryUsage).then(() => {
const dataPoints = const dataPoints = dx_utils.getDataPointElements(memoryElement);
diagnostics_test_utils.getDataPointElements(memoryElement);
assertEquals(fakeMemoryUsage[0].total_memory_kib, dataPoints[0].value); assertEquals(fakeMemoryUsage[0].total_memory_kib, dataPoints[0].value);
assertEquals( assertEquals(
fakeMemoryUsage[0].available_memory_kib, dataPoints[1].value); fakeMemoryUsage[0].available_memory_kib, dataPoints[1].value);
const barChart = const barChart = dx_utils.getPercentBarChartElement(memoryElement);
diagnostics_test_utils.getPercentBarChartElement(memoryElement);
const memInUse = fakeMemoryUsage[0].total_memory_kib - const memInUse = fakeMemoryUsage[0].total_memory_kib -
fakeMemoryUsage[0].available_memory_kib; fakeMemoryUsage[0].available_memory_kib;
assertEquals(fakeMemoryUsage[0].total_memory_kib, barChart.max); assertEquals(fakeMemoryUsage[0].total_memory_kib, barChart.max);
......
...@@ -10,7 +10,7 @@ import {RoutineName} from 'chrome://diagnostics/diagnostics_types.js'; ...@@ -10,7 +10,7 @@ import {RoutineName} from 'chrome://diagnostics/diagnostics_types.js';
import {ExecutionProgress, ResultStatusItem} from 'chrome://diagnostics/routine_list_executor.js'; import {ExecutionProgress, ResultStatusItem} from 'chrome://diagnostics/routine_list_executor.js';
import {flushTasks} from 'chrome://test/test_util.m.js'; import {flushTasks} from 'chrome://test/test_util.m.js';
import * as diagnostics_test_utils from './diagnostics_test_utils.js'; import * as dx_utils from './diagnostics_test_utils.js';
suite('RoutineResultListTest', () => { suite('RoutineResultListTest', () => {
/** @type {?HTMLElement} */ /** @type {?HTMLElement} */
...@@ -60,7 +60,7 @@ suite('RoutineResultListTest', () => { ...@@ -60,7 +60,7 @@ suite('RoutineResultListTest', () => {
* @return {!Array<!RoutineResultEntry>} * @return {!Array<!RoutineResultEntry>}
*/ */
function getEntries() { function getEntries() {
return diagnostics_test_utils.getResultEntries(routineResultListElement); return dx_utils.getResultEntries(routineResultListElement);
} }
test('ElementRendered', () => { test('ElementRendered', () => {
......
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