Commit 19d303e5 authored by Zentaro Kavanagh's avatar Zentaro Kavanagh Committed by Commit Bot

Diagnostics: Update naming convention to match mojo

Bug: 1125150
Test: browser_tests --gtest_filter=DiagnosticsApp*
Change-Id: I18cac456608ff2bdd50d1b45eebb0be9e938a568
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2523733
Commit-Queue: Zentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: default avatarBailey Berro <baileyberro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826193}
parent b088955b
......@@ -70,31 +70,31 @@ export function batteryStatusCardTestSuite() {
const dataPoints =
dx_utils.getDataPointElements(batteryStatusElement);
assertEquals(
fakeBatteryChargeStatus[0].current_now_milliamps,
fakeBatteryChargeStatus[0].currentNowMilliamps,
dataPoints[0].value);
assertEquals(
fakeBatteryHealth[0].charge_full_design_milliamp_hours,
fakeBatteryHealth[0].chargeFullDesignMilliampHours,
dataPoints[1].value);
assertEquals(
fakeBatteryChargeStatus[0].charge_full_now_milliamp_hours,
fakeBatteryChargeStatus[0].chargeFullNowMilliampHours,
dataPoints[2].value);
assertEquals(
fakeBatteryChargeStatus[0].charge_now_milliamp_hours,
fakeBatteryChargeStatus[0].chargeNowMilliampHours,
dataPoints[3].value);
assertEquals(
fakeBatteryChargeStatus[0].power_time, dataPoints[4].value);
fakeBatteryChargeStatus[0].powerTime, dataPoints[4].value);
assertEquals(
fakeBatteryChargeStatus[0].power_adapter_status,
fakeBatteryChargeStatus[0].powerAdapterStatus,
dataPoints[5].value);
assertEquals(fakeBatteryHealth[0].cycle_count, dataPoints[6].value);
assertEquals(fakeBatteryHealth[0].cycleCount, dataPoints[6].value);
const barChart =
dx_utils.getPercentBarChartElement(batteryStatusElement);
assertEquals(
fakeBatteryChargeStatus[0].charge_full_now_milliamp_hours,
fakeBatteryChargeStatus[0].chargeFullNowMilliampHours,
barChart.max);
assertEquals(
fakeBatteryChargeStatus[0].charge_now_milliamp_hours,
fakeBatteryChargeStatus[0].chargeNowMilliampHours,
barChart.value);
});
});
......
......@@ -90,15 +90,14 @@ export function cpuCardTestSuite() {
test('CpuCardPopulated', () => {
return initializeCpuCard(fakeCpuUsage).then(() => {
const dataPoints = dx_utils.getDataPointElements(cpuElement);
const currentlyUsingValue = fakeCpuUsage[0].percent_usage_user +
fakeCpuUsage[0].percent_usage_system;
const currentlyUsingValue =
fakeCpuUsage[0].percentUsageUser + fakeCpuUsage[0].percentUsageSystem;
assertEquals(currentlyUsingValue, dataPoints[0].value);
assertEquals(
fakeCpuUsage[0].cpu_temp_degrees_celcius, dataPoints[1].value);
assertEquals(fakeCpuUsage[0].cpuTempDegreesCelsius, dataPoints[1].value);
const cpuChart = dx_utils.getRealtimeCpuChartElement(cpuElement);
assertEquals(fakeCpuUsage[0].percent_usage_user, cpuChart.user);
assertEquals(fakeCpuUsage[0].percent_usage_system, cpuChart.system);
assertEquals(fakeCpuUsage[0].percentUsageUser, cpuChart.user);
assertEquals(fakeCpuUsage[0].percentUsageSystem, cpuChart.system);
// Verify the routine section is in the page.
assertTrue(!!getRoutineSection());
......
......@@ -24,34 +24,35 @@ export function fakeSystemDataProviderTestSuite() {
test('GetSystemInfo', () => {
/** @type {!DeviceCapabilities} */
const capabilities = {
has_battery: true,
hasBattery: true,
};
/** @type {!VersionInfo} */
const version = {
milestone_version: 'M97',
milestoneVersion: 'M97',
};
/** @type {!SystemInfo} */
const expected = {
board_name: 'BestBoard',
cpu_model_name: 'SuperFast CPU',
total_memory_kib: 9999,
cpu_threads_count: 4,
version: version,
device_capabilities: capabilities,
boardName: 'BestBoard',
cpuModelName: 'SuperFast CPU',
marketingName: 'Bestest 1000',
totalMemoryKib: 9999,
cpuThreadsCount: 4,
versionInfo: version,
deviceCapabilities: capabilities,
};
provider.setFakeSystemInfo(expected);
return provider.getSystemInfo().then((systemInfo) => {
assertDeepEquals(expected, systemInfo);
return provider.getSystemInfo().then((result) => {
assertDeepEquals(expected, result.systemInfo);
});
});
test('GetBatteryInfo', () => {
provider.setFakeBatteryInfo(fakeBatteryInfo);
return provider.getBatteryInfo().then((batteryInfo) => {
assertDeepEquals(fakeBatteryInfo, batteryInfo);
return provider.getBatteryInfo().then((result) => {
assertDeepEquals(fakeBatteryInfo, result.batteryInfo);
});
});
......@@ -121,8 +122,8 @@ export function fakeSystemDataProviderTestSuite() {
provider.reset();
provider.setFakeBatteryInfo(fakeBatteryInfo2);
return provider.getBatteryInfo().then((batteryInfo) => {
assertDeepEquals(fakeBatteryInfo2, batteryInfo);
return provider.getBatteryInfo().then((result) => {
assertDeepEquals(fakeBatteryInfo2, result.batteryInfo);
});
});
......@@ -130,8 +131,8 @@ export function fakeSystemDataProviderTestSuite() {
// Setup the initial fake data.
provider.setFakeBatteryInfo(fakeBatteryInfo);
return provider.getBatteryInfo()
.then((batteryInfo) => {
assertDeepEquals(fakeBatteryInfo, batteryInfo);
.then((result) => {
assertDeepEquals(fakeBatteryInfo, result.batteryInfo);
})
.then(() => {
// Reset and next time it should fire undefined.
......@@ -144,8 +145,8 @@ export function fakeSystemDataProviderTestSuite() {
// Set different data and next time should fire with it.
provider.reset();
provider.setFakeBatteryInfo(fakeBatteryInfo2);
return provider.getBatteryInfo().then((batteryInfo) => {
assertDeepEquals(fakeBatteryInfo2, batteryInfo);
return provider.getBatteryInfo().then((result) => {
assertDeepEquals(fakeBatteryInfo2, result.batteryInfo);
});
});
});
......
......@@ -35,7 +35,7 @@ export function fakeSystemRoutineContollerTestSuite() {
const routineRunnerRemote = {
onRoutineResult: (resultInfo) => {
assertEquals(expectedName, resultInfo.name);
assertEquals(expectedResult, resultInfo.result.simple_result);
assertEquals(expectedResult, resultInfo.result.simpleResult);
resolver.resolve();
}
};
......@@ -70,7 +70,7 @@ export function fakeSystemRoutineContollerTestSuite() {
assertTrue(controller.isRoutineInProgressForTesting());
assertFalse(wasRun);
assertEquals(expectedName, resultInfo.name);
assertEquals(expectedResult, resultInfo.result.simple_result);
assertEquals(expectedResult, resultInfo.result.simpleResult);
// Mark that the test completed.
wasRun = true;
......
......@@ -89,14 +89,13 @@ export function memoryCardTestSuite() {
test('MemoryCardPopulated', () => {
return initializeMemoryCard(fakeMemoryUsage).then(() => {
const dataPoints = dx_utils.getDataPointElements(memoryElement);
assertEquals(fakeMemoryUsage[0].total_memory_kib, dataPoints[0].value);
assertEquals(
fakeMemoryUsage[0].available_memory_kib, dataPoints[1].value);
assertEquals(fakeMemoryUsage[0].totalMemoryKib, dataPoints[0].value);
assertEquals(fakeMemoryUsage[0].availableMemoryKib, dataPoints[1].value);
const barChart = dx_utils.getPercentBarChartElement(memoryElement);
const memInUse = fakeMemoryUsage[0].total_memory_kib -
fakeMemoryUsage[0].available_memory_kib;
assertEquals(fakeMemoryUsage[0].total_memory_kib, barChart.max);
const memInUse = fakeMemoryUsage[0].totalMemoryKib -
fakeMemoryUsage[0].availableMemoryKib;
assertEquals(fakeMemoryUsage[0].totalMemoryKib, barChart.max);
assertEquals(memInUse, barChart.value);
// Verify the routine section is in the card.
......
......@@ -53,16 +53,16 @@ export function overviewCardTestSuite() {
test('OverviewCardPopulated', () => {
return initializeOverviewCard(fakeSystemInfo).then(() => {
assertEquals(
fakeSystemInfo.board_name,
fakeSystemInfo.boardName,
overviewElement.$$('#boardName').textContent);
assertEquals(
fakeSystemInfo.cpu_model_name,
fakeSystemInfo.cpuModelName,
overviewElement.$$('#cpuModelName').textContent);
assertEquals(
fakeSystemInfo.total_memory_kib.toString(),
fakeSystemInfo.totalMemoryKib.toString(),
overviewElement.$$('#totalMemory').textContent);
assertEquals(
fakeSystemInfo.version.milestone_version,
fakeSystemInfo.versionInfo.milestoneVersion,
overviewElement.$$('#version').textContent);
});
});
......
......@@ -38,9 +38,9 @@ export function fakeRoutineListExecutorTestSuite() {
// Set the result into the fake.
assertNotEquals(undefined, routine);
assertNotEquals(undefined, routine.result);
assertNotEquals(undefined, routine.result.simple_result);
assertNotEquals(undefined, routine.result.simpleResult);
controller.setFakeStandardRoutineResult(
routine.name, routine.result.simple_result);
routine.name, routine.result.simpleResult);
// Build the list of routines to run.
routineNames.push(routine.name);
......@@ -69,8 +69,8 @@ export function fakeRoutineListExecutorTestSuite() {
assertEquals(null, status.result);
} else {
assertEquals(
expectedCallbacks[upto].result.simple_result,
status.result.simple_result);
expectedCallbacks[upto].result.simpleResult,
status.result.simpleResult);
}
upto++;
......@@ -86,7 +86,7 @@ export function fakeRoutineListExecutorTestSuite() {
/** @type {!Array<!RoutineResultInfo>} */
const routines = [{
name: RoutineName.kCpuStress,
result: {simple_result: StandardRoutineResult.kTestFailed}
result: {simpleResult: StandardRoutineResult.kTestFailed}
}];
return runRoutinesAndAssertResults(routines);
});
......@@ -96,19 +96,19 @@ export function fakeRoutineListExecutorTestSuite() {
const routines = [
{
name: RoutineName.kCpuStress,
result: {simple_result: StandardRoutineResult.kTestPassed}
result: {simpleResult: StandardRoutineResult.kTestPassed}
},
{
name: RoutineName.kCpuCache,
result: {simple_result: StandardRoutineResult.kTestFailed}
result: {simpleResult: StandardRoutineResult.kTestFailed}
},
{
name: RoutineName.kFloatingPoint,
result: {simple_result: StandardRoutineResult.kTestPassed}
result: {simpleResult: StandardRoutineResult.kTestPassed}
},
{
name: RoutineName.kPrimeSearch,
result: {simple_result: StandardRoutineResult.kTestFailed}
result: {simpleResult: StandardRoutineResult.kTestFailed}
}
];
......
......@@ -137,7 +137,7 @@ export function routineResultEntryTestSuite() {
test('PassedTest', () => {
const item = createCompletedStatus(
RoutineName.kCpuStress,
{simple_result: StandardRoutineResult.kTestPassed});
{simpleResult: StandardRoutineResult.kTestPassed});
return initializeEntryWithItem(item).then(() => {
// TODO(zentaro): Localize the test.
assertEquals(getNameText(), 'kCpuStress');
......@@ -150,7 +150,7 @@ export function routineResultEntryTestSuite() {
test('FailedTest', () => {
const item = createCompletedStatus(
RoutineName.kCpuStress,
{simple_result: StandardRoutineResult.kTestFailed});
{simpleResult: StandardRoutineResult.kTestFailed});
return initializeEntryWithItem(item).then(() => {
// TODO(zentaro): Localize the test.
assertEquals(getNameText(), 'kCpuStress');
......
......@@ -160,7 +160,7 @@ export function routineResultListTestSuite() {
// Move the first routine to completed state.
status = new ResultStatusItem(routines[0]);
status.progress = ExecutionProgress.kCompleted;
status.result = {simple_result: StandardRoutineResult.kTestPassed};
status.result = {simpleResult: StandardRoutineResult.kTestPassed};
routineResultListElement.onStatusUpdate(status);
return flushTasks();
......@@ -172,7 +172,7 @@ export function routineResultListTestSuite() {
assertNotEquals(null, getEntries()[0].item.result);
assertEquals(
StandardRoutineResult.kTestPassed,
getEntries()[0].item.result.simple_result);
getEntries()[0].item.result.simpleResult);
status = new ResultStatusItem(routines[1]);
status.progress = ExecutionProgress.kRunning;
......@@ -189,7 +189,7 @@ export function routineResultListTestSuite() {
// Move the second routine to completed state.
status = new ResultStatusItem(routines[1]);
status.progress = ExecutionProgress.kCompleted;
status.result = {simple_result: StandardRoutineResult.kTestPassed};
status.result = {simpleResult: StandardRoutineResult.kTestPassed};
routineResultListElement.onStatusUpdate(status);
return flushTasks();
......@@ -201,7 +201,7 @@ export function routineResultListTestSuite() {
assertNotEquals(null, getEntries()[1].item.result);
assertEquals(
StandardRoutineResult.kTestPassed,
getEntries()[0].item.result.simple_result);
getEntries()[0].item.result.simpleResult);
return flushTasks();
});
......
......@@ -4,29 +4,29 @@
<diagnostics-card>
<div id="cardTitle" slot="title">[[i18n('batteryTitle')]]</div>
<percent-bar-chart slot="left-panel" header="[[i18n('remainingCharge')]]"
value="[[batteryChargeStatus_.charge_now_milliamp_hours]]"
max="[[batteryChargeStatus_.charge_full_now_milliamp_hours]]">
value="[[batteryChargeStatus_.chargeNowMilliampHours]]"
max="[[batteryChargeStatus_.chargeFullNowMilliampHours]]">
</percent-bar-chart>
<data-point slot="body" id="currentNow" header="[[i18n('currentNow')]]"
value="[[batteryChargeStatus_.current_now_milliamps]]">
value="[[batteryChargeStatus_.currentNowMilliamps]]">
</data-point>
<data-point slot="body" id="chargeFullDesign"
header="[[i18n('chargeFullDesign')]]"
value="[[batteryHealth_.charge_full_design_milliamp_hours]]">
value="[[batteryHealth_.chargeFullDesignMilliampHours]]">
</data-point>
<data-point slot="body" id="chargeFullNow" header="[[i18n('chargeFullNow')]]"
value="[[batteryChargeStatus_.charge_full_now_milliamp_hours]]">
value="[[batteryChargeStatus_.chargeFullNowMilliampHours]]">
</data-point>
<data-point slot="body" id="chargeNow" header="[[i18n('chargeNow')]]"
value="[[batteryChargeStatus_.charge_now_milliamp_hours]]">
value="[[batteryChargeStatus_.chargeNowMilliampHours]]">
</data-point>
<data-point slot="body" id="powerTime" header="[[i18n('powerTime')]]"
value="[[batteryChargeStatus_.power_time]]">
value="[[batteryChargeStatus_.powerTime]]">
</data-point>
<data-point slot="body" id="adapterStatus" header="[[i18n('adapterStatus')]]"
value="[[batteryChargeStatus_.power_adapter_status]]">
value="[[batteryChargeStatus_.powerAdapterStatus]]">
</data-point>
<data-point slot="body" id="cycleCount" header="[[i18n('cycleCount')]]"
value="[[batteryHealth_.cycle_count]]">
value="[[batteryHealth_.cycleCount]]">
</data-point>
</diagnostics-card>
......@@ -62,11 +62,11 @@ Polymer({
},
/**
* @param {!BatteryInfo} batteryInfo
* @param {!{batteryInfo: !BatteryInfo}} result
* @private
*/
onBatteryInfoReceived_(batteryInfo) {
this.batteryInfo_ = batteryInfo;
onBatteryInfoReceived_(result) {
this.batteryInfo_ = result.batteryInfo;
},
/** @private */
......
......@@ -5,17 +5,17 @@
<div id="cardTitle" slot="title">[[i18n('cpuTitle')]]</div>
<!-- TODO(michaelcheco): Add i18n string for percent number format -->
<realtime-cpu-chart slot="left-panel" id="realtimeCpuChart"
user="[[cpuUsage_.percent_usage_user]]"
system="[[cpuUsage_.percent_usage_system]]">
user="[[cpuUsage_.percentUsageUser]]"
system="[[cpuUsage_.percentUsageSystem]]">
</realtime-cpu-chart>
<data-point slot="body" id="cpuUsageUser" header="[[i18n('cpuUsage')]]"
value="[[computeCurrentlyUsing_(cpuUsage_.percent_usage_system,
cpuUsage_.percent_usage_user)]]">
value="[[computeCurrentlyUsing_(cpuUsage_.percentUsageSystem,
cpuUsage_.percentUsageUser)]]">
</data-point>
<!-- TODO(michaelcheco): Investigate whether or not temperature can be
localized. -->
<data-point slot="body" id="cpuTemp" header="[[i18n('cpuTemp')]]"
value="[[cpuUsage_.cpu_temp_degrees_celcius]]">
value="[[cpuUsage_.cpuTempDegreesCelsius]]">
</data-point>
<routine-section slot="routines" routines="[[routines_]]"></routine-section>
......
......@@ -55,11 +55,12 @@ Polymer({
},
/**
* @param {!SystemInfo} systemInfo
* @param {{systemInfo: !SystemInfo}} result
* @private
*/
onSystemInfoReceived_(systemInfo) {
this.showBatteryStatusCard_ = systemInfo.device_capabilities.has_battery;
onSystemInfoReceived_(result) {
this.showBatteryStatusCard_ =
result.systemInfo.deviceCapabilities.hasBattery;
},
});
\ No newline at end of file
......@@ -38,8 +38,8 @@ export let ObserveMemoryUsageFunction;
* Type alias for the SystemDataProviderInterface.
* TODO(zentaro): Replace with a real mojo type when implemented.
* @typedef {{
* getBatteryInfo: !function(): !Promise<!BatteryInfo>,
* getSystemInfo: !function(): !Promise<!SystemInfo>,
* getBatteryInfo: !function(): !Promise<!{batteryInfo: !BatteryInfo}>,
* getSystemInfo: !function(): !Promise<!{systemInfo: SystemInfo}>,
* observeBatteryChargeStatus: !ObserveBatteryChargeStatusFunction,
* observeBatteryHealth: !ObserveBatteryHealthFunction,
* observeCpuUsage: !ObserveCpuUsageFunction,
......@@ -51,7 +51,7 @@ export let SystemDataProviderInterface;
/**
* Type alias for DeviceCapabilities.
* @typedef {{
* has_battery: boolean,
* hasBattery: boolean,
* }}
*/
export let DeviceCapabilities;
......@@ -59,7 +59,7 @@ export let DeviceCapabilities;
/**
* Type alias for VersionInfo.
* @typedef {{
* milestone_version: string,
* milestoneVersion: string,
* }}
*/
export let VersionInfo;
......@@ -67,12 +67,13 @@ export let VersionInfo;
/**
* Type alias for SystemInfo.
* @typedef {{
* board_name: string,
* cpu_model_name: string,
* cpu_threads_count: number,
* device_capabilities: DeviceCapabilities,
* total_memory_kib: number,
* version: VersionInfo,
* boardName: string,
* cpuModelName: string,
* cpuThreadsCount: number,
* deviceCapabilities: DeviceCapabilities,
* marketingName: string,
* totalMemoryKib: number,
* versionInfo: VersionInfo,
* }}
*/
export let SystemInfo;
......@@ -80,7 +81,7 @@ export let SystemInfo;
/**
* Type alias for BatteryInfo.
* @typedef {{
* charge_full_design_milliamp_hours: number,
* chargeFullDesignMilliampHours: number,
* manufacturer: string,
* }}
*/
......@@ -97,9 +98,9 @@ export let CpuUsageObserver;
/**
* Type alias for CpuUsage.
* @typedef {{
* cpu_temp_degrees_celcius: number,
* percent_usage_system: number,
* percent_usage_user: number,
* cpuTempDegreesCelsius: number,
* percentUsageSystem: number,
* percentUsageUser: number,
* }}
*/
export let CpuUsage;
......@@ -122,14 +123,25 @@ export let ExternalPowerSource = {
kDisconnected: 2,
};
/**
* Battery state enumeration.
* @enum {number}
*/
export let BatteryState = {
kCharging: 0,
kDischarging: 1,
kFull: 2,
};
/**
* Type alias for BatteryChargeStatus.
* @typedef {{
* charge_full_now_milliamp_hours: number,
* charge_now_milliamp_hours: number,
* current_now_milliamps: number,
* power_adapter_status: ExternalPowerSource,
* power_time: string,
* batteryState: BatteryState,
* chargeFullNowMilliampHours: number,
* chargeNowMilliampHours: number,
* currentNowMilliamps: number,
* powerAdapterStatus: ExternalPowerSource,
* powerTime: string,
* }}
*/
export let BatteryChargeStatus;
......@@ -145,10 +157,10 @@ export let BatteryHealthObserver;
/**
* Type alias for BatteryHealth.
* @typedef {{
* battery_wear_percentage: number,
* charge_full_design_milliamp_hours: number,
* charge_full_now_milliamp_hours: number,
* cycle_count: number,
* batteryWearPercentage: number,
* chargeFullDesignMilliampHours: number,
* chargeFullNowMilliampHours: number,
* cycleCount: number,
* }}
*/
export let BatteryHealth;
......@@ -164,9 +176,9 @@ export let MemoryUsageObserver;
/**
* Type alias for MemoryUsage.
* @typedef {{
* available_memory_kib: number,
* free_memory_kib: number,
* total_memory_kib: number,
* availableMemoryKib: number,
* freeMemoryKib: number,
* totalMemoryKib: number,
* }}
*/
export let MemoryUsage;
......@@ -201,7 +213,7 @@ export let StandardRoutineResult = {
* Type alias for RoutineResult.
* TODO(zentaro): Currently only includes simple result type.
* @typedef {{
* simple_result: !StandardRoutineResult
* simpleResult: !StandardRoutineResult
* }}
*/
export let RoutineResult;
......
......@@ -7,142 +7,144 @@ import {BatteryChargeStatus, BatteryHealth, CpuUsage, ExternalPowerSource, Memor
/* @type {!Array<!BatteryChargeStatus>} */
export const fakeBatteryChargeStatus = [
{
charge_full_now_milliamp_hours: 5700,
charge_now_milliamp_hours: 4200,
current_now_milliamps: 1123,
power_adapter_status: ExternalPowerSource.kAc,
power_time: '3h 15m',
chargeFullNowMilliampHours: 5700,
chargeNowMilliampHours: 4200,
currentNowMilliamps: 1123,
powerAdapterStatus: ExternalPowerSource.kAc,
powerTime: '3h 15m',
},
{
charge_full_now_milliamp_hours: 5700,
charge_now_milliamp_hours: 4500,
current_now_milliamps: 1123,
power_adapter_status: ExternalPowerSource.kAc,
power_time: '3h 01m',
chargeFullNowMilliampHours: 5700,
chargeNowMilliampHours: 4500,
currentNowMilliamps: 1123,
powerAdapterStatus: ExternalPowerSource.kAc,
powerTime: '3h 01m',
},
{
charge_full_now_milliamp_hours: 5700,
charge_now_milliamp_hours: 4800,
current_now_milliamps: 1123,
power_adapter_status: ExternalPowerSource.kAc,
power_time: '2h 45m',
chargeFullNowMilliampHours: 5700,
chargeNowMilliampHours: 4800,
currentNowMilliamps: 1123,
powerAdapterStatus: ExternalPowerSource.kAc,
powerTime: '2h 45m',
}
];
/* @type {!Array<!BatteryHealth>} */
export const fakeBatteryHealth = [
{
battery_wear_percentage: 7,
charge_full_design_milliamp_hours: 6000,
charge_full_now_milliamp_hours: 5700,
cycle_count: 73,
batteryWearPercentage: 7,
chargeFullDesignMilliampHours: 6000,
chargeFullNowMilliampHours: 5700,
cycleCount: 73,
},
{
battery_wear_percentage: 8,
charge_full_design_milliamp_hours: 6000,
charge_full_now_milliamp_hours: 5699,
cycle_count: 73,
battery_weabatteryWearPercentager_percentage: 8,
chargeFullDesignMilliampHours: 6000,
chargeFullNowMilliampHours: 5699,
cycleCount: 73,
}
];
/* @type {!BatteryInfo} */
export const fakeBatteryInfo = {
charge_full_design_milliamp_hours: 6000,
chargeFullDesignMilliampHours: 6000,
manufacturer: 'BatterCorp USA',
};
/* @type {!BatteryInfo} */
export const fakeBatteryInfo2 = {
charge_full_design_milliamp_hours: 9000,
chargeFullDesignMilliampHours: 9000,
manufacturer: 'PowerPod 9000',
};
/* @type {!Array<!CpuUsage>} */
export const fakeCpuUsage = [
{
cpu_temp_degrees_celcius: 107,
percent_usage_system: 15,
percent_usage_user: 20,
cpuTempDegreesCelsius: 107,
percentUsageSystem: 15,
percentUsageUser: 20,
},
{
cpu_temp_degrees_celcius: 106,
percent_usage_system: 30,
percent_usage_user: 40,
cpuTempDegreesCelsius: 106,
percentUsageSystem: 30,
percentUsageUser: 40,
},
{
cpu_temp_degrees_celcius: 107,
percent_usage_system: 31,
percent_usage_user: 45,
cpuTempDegreesCelsius: 107,
percentUsageSystem: 31,
percentUsageUser: 45,
},
{
cpu_temp_degrees_celcius: 109,
percent_usage_system: 55,
percent_usage_user: 24,
cpuTempDegreesCelsius: 109,
percentUsageSystem: 55,
percentUsageUser: 24,
},
{
cpu_temp_degrees_celcius: 109,
percent_usage_system: 49,
percent_usage_user: 10,
cpuTempDegreesCelsius: 109,
percentUsageSystem: 49,
percentUsageUser: 10,
},
{
cpu_temp_degrees_celcius: 161,
percent_usage_system: 1,
percent_usage_user: 99,
cpuTempDegreesCelsius: 161,
percentUsageSystem: 1,
percentUsageUser: 99,
},
{
cpu_temp_degrees_celcius: 118,
percent_usage_system: 35,
percent_usage_user: 37,
cpuTempDegreesCelsius: 118,
percentUsageSystem: 35,
percentUsageUser: 37,
},
{
cpu_temp_degrees_celcius: 110,
percent_usage_system: 26,
percent_usage_user: 30,
cpuTempDegreesCelsius: 110,
percentUsageSystem: 26,
percentUsageUser: 30,
},
];
/* @type {!Array<!MemoryUsage>} */
export const fakeMemoryUsage = [
{
available_memory_kib: 57000,
free_memory_kib: 15000,
total_memory_kib: 128000,
availableMemoryKib: 57000,
freeMemoryKib: 15000,
totalMemoryKib: 128000,
},
{
available_memory_kib: 52000,
free_memory_kib: 15000,
total_memory_kib: 128000,
availableMemoryKib: 52000,
freeMemoryKib: 15000,
totalMemoryKib: 128000,
},
{
available_memory_kib: 53000,
free_memory_kib: 15000,
total_memory_kib: 128000,
availableMemoryKib: 53000,
freeMemoryKib: 15000,
totalMemoryKib: 128000,
},
{
available_memory_kib: 65000,
free_memory_kib: 15000,
total_memory_kib: 128000,
availableMemoryKib: 65000,
freeMemoryKib: 15000,
totalMemoryKib: 128000,
}
];
/* @type {!SystemInfo} */
export const fakeSystemInfo = {
board_name: 'CrOS Board',
cpu_model_name: 'BestCpu SoFast 1000',
cpu_threads_count: 8,
device_capabilities: {has_battery: true},
total_memory_kib: 128000,
version: {milestone_version: 'M99'},
boardName: 'CrOS Board',
cpuModelName: 'BestCpu SoFast 1000',
cpuThreadsCount: 8,
deviceCapabilities: {hasBattery: true},
marketingName: 'Coolest Chromebook',
totalMemoryKib: 128000,
versionInfo: {milestoneVersion: 'M99'},
};
/* @type {!SystemInfo} */
export const fakeSystemInfoWithoutBattery = {
board_name: 'CrOS Board',
cpu_model_name: 'BestCpu SoFast 1000',
cpu_threads_count: 8,
device_capabilities: {has_battery: false},
total_memory_kib: 128000,
version: {milestone_version: 'M99'},
boardName: 'CrOS Board',
cpuModelName: 'BestCpu SoFast 1000',
cpuThreadsCount: 8,
deviceCapabilities: {hasBattery: false},
marketingName: 'Coolest Chromebook',
totalMemoryKib: 128000,
versionInfo: {milestoneVersion: 'M99'},
};
/* @type {!Map<RoutineName, StandardRoutineResult} */
......
......@@ -25,7 +25,7 @@ export class FakeSystemDataProvider {
}
/**
* @return {!Promise<!SystemInfo>}
* @return {!Promise<!{systemInfo: !SystemInfo}>}
*/
getSystemInfo() {
return this.methods_.resolveMethod('getSystemInfo');
......@@ -36,12 +36,12 @@ export class FakeSystemDataProvider {
* @param {!SystemInfo} systemInfo
*/
setFakeSystemInfo(systemInfo) {
this.methods_.setResult('getSystemInfo', systemInfo);
this.methods_.setResult('getSystemInfo', {systemInfo: systemInfo});
}
/**
* Implements SystemDataProviderInterface.GetBatteryInfo.
* @return {!Promise<!BatteryInfo>}
* @return {!Promise<!{batteryInfo: !BatteryInfo}>}
*/
getBatteryInfo() {
return this.methods_.resolveMethod('getBatteryInfo');
......@@ -52,7 +52,7 @@ export class FakeSystemDataProvider {
* @param {!BatteryInfo} batteryInfo
*/
setFakeBatteryInfo(batteryInfo) {
this.methods_.setResult('getBatteryInfo', batteryInfo);
this.methods_.setResult('getBatteryInfo', {batteryInfo: batteryInfo});
}
/*
......
......@@ -130,7 +130,7 @@ export class FakeSystemRoutineController {
/** @type {!RoutineResult} */
const fullResult = {
simple_result: result,
simpleResult: result,
};
/** @type {!RoutineResultInfo} */
......
......@@ -5,14 +5,14 @@
<div id="cardTitle" slot="title">[[i18n('memoryTitle')]]</div>
<percent-bar-chart slot="left-panel" header="[[i18n('usedMemory')]]"
value="[[getTotalUsedMemory_(memoryUsage_)]]"
max="[[memoryUsage_.total_memory_kib]]">
max="[[memoryUsage_.totalMemoryKib]]">
</percent-bar-chart>
<data-point slot="body" id="memoryTotal" header="[[i18n('totalMemory')]]"
value="[[memoryUsage_.total_memory_kib]]">
value="[[memoryUsage_.totalMemoryKib]]">
</data-point>
<data-point slot="body" id="memoryAvailable"
header="[[i18n('memoryAvailable')]]"
value="[[memoryUsage_.available_memory_kib]]">
value="[[memoryUsage_.availableMemoryKib]]">
</data-point>
<routine-section slot="routines" routines="[[routines_]]"></routine-section>
......
......@@ -74,7 +74,6 @@ Polymer({
* @private
*/
getTotalUsedMemory_(memoryUsage) {
return memoryUsage.total_memory_kib -
memoryUsage.available_memory_kib;
return memoryUsage.totalMemoryKib - memoryUsage.availableMemoryKib;
}
});
......@@ -17,8 +17,8 @@
}
</style>
<div id="overviewCardContainer">
<div id="boardName">[[systemInfo_.board_name]]</div>
<div id="cpuModelName">[[systemInfo_.cpu_model_name]]</div>
<div id="totalMemory">[[systemInfo_.total_memory_kib]]</div>
<div id="version">[[systemInfo_.version.milestone_version]]</div>
<div id="boardName">[[systemInfo_.boardName]]</div>
<div id="cpuModelName">[[systemInfo_.cpuModelName]]</div>
<div id="totalMemory">[[systemInfo_.totalMemoryKib]]</div>
<div id="version">[[systemInfo_.versionInfo.milestoneVersion]]</div>
</div>
......@@ -46,11 +46,11 @@ Polymer({
},
/**
* @param {!SystemInfo} systemInfo
* @param {!{systemInfo: !SystemInfo}} result
* @private
*/
onSystemInfoReceived_(systemInfo) {
this.systemInfo_ = systemInfo;
onSystemInfoReceived_(result) {
this.systemInfo_ = result.systemInfo;
},
});
......@@ -88,7 +88,7 @@ Polymer({
return lookupEnumValueName(ExecutionProgress, ExecutionProgress.kRunning);
}
return lookupEnumValueName(StandardRoutineResult, result.simple_result);
return lookupEnumValueName(StandardRoutineResult, result.simpleResult);
},
/** @override */
......
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