From 14694c675b654747218734a0bb0c532e8bb57fb4 Mon Sep 17 00:00:00 2001 From: Sarah Hale Date: Mon, 29 Jun 2015 13:13:05 -0700 Subject: [PATCH] [Events] All tests work All of the tests for the RT Events are working. #26. --- platform/features/rtevents/src/DomainColumn.js | 2 ++ platform/features/rtevents/src/RTEventListController.js | 4 ++-- platform/features/rtevents/src/RangeColumn.js | 2 +- platform/features/rtevents/test/suite.json | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/platform/features/rtevents/src/DomainColumn.js b/platform/features/rtevents/src/DomainColumn.js index c4f8a2a143..43279a42d7 100644 --- a/platform/features/rtevents/src/DomainColumn.js +++ b/platform/features/rtevents/src/DomainColumn.js @@ -47,6 +47,8 @@ define( * @returns {string} the title to display */ getTitle: function () { + // At the moment there does not appear to be a way to get the + // column's title through metadata for real time telemetry return "Time"; }, /** diff --git a/platform/features/rtevents/src/RTEventListController.js b/platform/features/rtevents/src/RTEventListController.js index 563dcee2ce..bed335c6cd 100644 --- a/platform/features/rtevents/src/RTEventListController.js +++ b/platform/features/rtevents/src/RTEventListController.js @@ -46,6 +46,7 @@ define( rows = []; function getTelemetryObjects() { + //console.log("handle.getTelemetryObjects() ", handle.getTelemetryObjects()); return handle ? handle.getTelemetryObjects() : []; } @@ -65,7 +66,7 @@ define( columns = []; - columns.push(new DomainColumn(telemetryFormatter, telemetryHandler.getMetadata())); + columns.push(new DomainColumn(telemetryFormatter)); columns.push(new RangeColumn()); headers = columns.map(function (column) { @@ -92,7 +93,6 @@ define( return column.getValue(telemetryObject, handle).text; })); // Remove first rows when adding past the max rows limit - //rows.splice(ROW_COUNT, Number.MAX_VALUE); rows.splice(0, rows.length - ROW_COUNT); lastUpdated[id] = domainValue; } diff --git a/platform/features/rtevents/src/RangeColumn.js b/platform/features/rtevents/src/RangeColumn.js index 8fcf747b25..68147062b5 100644 --- a/platform/features/rtevents/src/RangeColumn.js +++ b/platform/features/rtevents/src/RangeColumn.js @@ -32,7 +32,7 @@ define( /** * A column which will report telemetry range values - * (typically, measurements.) Used by the RTScrollingListController. + * (typically, measurements.) Used by the RTEventListController. * * @constructor * @param rangeMetadata an object with the machine- and human- diff --git a/platform/features/rtevents/test/suite.json b/platform/features/rtevents/test/suite.json index bbc59b1738..996a8ce906 100644 --- a/platform/features/rtevents/test/suite.json +++ b/platform/features/rtevents/test/suite.json @@ -1,6 +1,6 @@ [ "DomainColumn", + "policies/RTMessagesViewPolicy", "RangeColumn", - "RTEventListController", - "policies/RTMessagesViewPolicy" + "RTEventListController" ] \ No newline at end of file