diagnostics: fix fake_data types

Type annotations must begin with "/**" even if it's a single line.
JSC also doesn't seem to infer array destructuring.

Bug: 1125150
Test: browser_tests --gtest_filter=Diagnostics*
Change-Id: I320080ec0ef4baa0807e07af10f4b9d70d226128
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542730
Commit-Queue: Zentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Auto-Submit: Joon Ahn <joonbug@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828283}

chrome/test/data/webui/chromeos/diagnostics/battery_status_card_test.js

@@ -77,7 +77,7 @@ export function batteryStatusCardTestSuite() {
               fakeBatteryHealth[0].chargeFullDesignMilliampHours,
               dataPoints[1].value);
           assertEquals(
-              fakeBatteryChargeStatus[0].chargeFullNowMilliampHours,
+              fakeBatteryHealth[0].chargeFullNowMilliampHours,
               dataPoints[2].value);
           assertEquals(
               fakeBatteryChargeStatus[0].chargeNowMilliampHours,
@@ -91,13 +91,12 @@ export function batteryStatusCardTestSuite() {
           assertEquals(fakeBatteryHealth[0].cycleCount, dataPoints[6].value);
           dx_utils.assertElementContainsText(
               batteryStatusElement.$$('#batteryStatusChipInfo'),
-              fakeBatteryHealth[0].chargeFullDesignMilliampHours);
+              `${fakeBatteryHealth[0].chargeFullDesignMilliampHours}`);
 
           const barChart =
               dx_utils.getPercentBarChartElement(batteryStatusElement);
           assertEquals(
-              fakeBatteryChargeStatus[0].chargeFullNowMilliampHours,
-              barChart.max);
+              fakeBatteryHealth[0].chargeFullNowMilliampHours, barChart.max);
           assertEquals(
               fakeBatteryChargeStatus[0].chargeNowMilliampHours,
               barChart.value);

chromeos/components/diagnostics_ui/resources/fake_data.js

@@ -2,27 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {BatteryChargeStatus, BatteryHealth, CpuUsage, ExternalPowerSource, MemoryUsage, RoutineName, StandardRoutineResult, SystemInfo} from './diagnostics_types.js'
+import {BatteryChargeStatus, BatteryInfo, BatteryHealth, CpuUsage, ExternalPowerSource, MemoryUsage, RoutineName, StandardRoutineResult, SystemInfo} from './diagnostics_types.js'
 import {stringToMojoString16} from './mojo_utils.js';
 
-/* @type {!Array<!BatteryChargeStatus>} */
+/** @type {!Array<!BatteryChargeStatus>} */
 export const fakeBatteryChargeStatus = [
   {
-    chargeFullNowMilliampHours: 5700,
     chargeNowMilliampHours: 4200,
     currentNowMilliamps: 1123,
     powerAdapterStatus: chromeos.diagnostics.mojom.ExternalPowerSource.kAc,
     powerTime: stringToMojoString16('3h 15m'),
   },
   {
-    chargeFullNowMilliampHours: 5700,
     chargeNowMilliampHours: 4500,
     currentNowMilliamps: 1123,
     powerAdapterStatus: chromeos.diagnostics.mojom.ExternalPowerSource.kAc,
     powerTime: stringToMojoString16('3h 01m'),
   },
   {
-    chargeFullNowMilliampHours: 5700,
     chargeNowMilliampHours: 4800,
     currentNowMilliamps: 1123,
     powerAdapterStatus: chromeos.diagnostics.mojom.ExternalPowerSource.kAc,
@@ -30,7 +27,7 @@ export const fakeBatteryChargeStatus = [
   }
 ];
 
-/* @type {!Array<!BatteryHealth>} */
+/** @type {!Array<!BatteryHealth>} */
 export const fakeBatteryHealth = [
   {
     batteryWearPercentage: 7,
@@ -46,19 +43,19 @@ export const fakeBatteryHealth = [
   }
 ];
 
-/* @type {!BatteryInfo} */
+/** @type {!BatteryInfo} */
 export const fakeBatteryInfo = {
   chargeFullDesignMilliampHours: 6000,
   manufacturer: 'BatterCorp USA',
 };
 
-/* @type {!BatteryInfo} */
+/** @type {!BatteryInfo} */
 export const fakeBatteryInfo2 = {
   chargeFullDesignMilliampHours: 9000,
   manufacturer: 'PowerPod 9000',
 };
 
-/* @type {!Array<!CpuUsage>} */
+/** @type {!Array<!CpuUsage>} */
 export const fakeCpuUsage = [
   {
     averageCpuTempCelsius: 107,
@@ -102,7 +99,7 @@ export const fakeCpuUsage = [
   },
 ];
 
-/* @type {!Array<!MemoryUsage>} */
+/** @type {!Array<!MemoryUsage>} */
 export const fakeMemoryUsage = [
   {
     availableMemoryKib: 57000,
@@ -126,7 +123,7 @@ export const fakeMemoryUsage = [
   }
 ];
 
-/* @type {!SystemInfo} */
+/** @type {!SystemInfo} */
 export const fakeSystemInfo = {
   boardName: 'CrOS Board',
   cpuModelName: 'BestCpu SoFast 1000',
@@ -137,7 +134,7 @@ export const fakeSystemInfo = {
   versionInfo: {milestoneVersion: 'M99'},
 };
 
-/* @type {!SystemInfo} */
+/** @type {!SystemInfo} */
 export const fakeSystemInfoWithoutBattery = {
   boardName: 'CrOS Board',
   cpuModelName: 'BestCpu SoFast 1000',
@@ -148,7 +145,7 @@ export const fakeSystemInfoWithoutBattery = {
   versionInfo: {milestoneVersion: 'M99'},
 };
 
-/* @type {!Map<RoutineName, StandardRoutineResult} */
+/** @type {!Map<!RoutineName, !StandardRoutineResult>} */
 export const fakeRoutineResults = new Map([
   [RoutineName.kCpuStress, StandardRoutineResult.kTestPassed],
   [RoutineName.kCpuCache, StandardRoutineResult.kTestPassed],

chromeos/components/diagnostics_ui/resources/mojo_interface_provider.js

@@ -7,8 +7,10 @@ import 'chrome://resources/mojo/mojo/public/mojom/base/big_buffer.mojom-lite.js'
 import 'chrome://resources/mojo/mojo/public/mojom/base/string16.mojom-lite.js';
 import './system_data_provider.mojom-lite.js';
 import './system_routine_controller.mojom-lite.js';
+
 import {assert} from 'chrome://resources/js/assert.m.js';
-import {SystemDataProviderInterface, SystemInfo, SystemRoutineControllerInterface} from './diagnostics_types.js';
+
+import {RoutineName, StandardRoutineResult, SystemDataProviderInterface, SystemInfo, SystemRoutineControllerInterface} from './diagnostics_types.js';
 import {fakeBatteryChargeStatus, fakeBatteryHealth, fakeBatteryInfo, fakeCpuUsage, fakeMemoryUsage, fakeRoutineResults, fakeSystemInfo} from './fake_data.js';
 import {FakeSystemDataProvider} from './fake_system_data_provider.js';
 import {FakeSystemRoutineController} from './fake_system_routine_controller.js';
@@ -55,7 +57,9 @@ function setupFakeSystemRoutineController_() {
 
   // Add fake results for routines.
   for (const [routine, result] of fakeRoutineResults.entries()) {
-    controller.setFakeStandardRoutineResult(routine, result);
+    controller.setFakeStandardRoutineResult(
+        /** @type{!RoutineName} */ (routine),
+        /** @type{!StandardRoutineResult} */ (result));
   }
 
   // Set the fake controller.