ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-14 13:18:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #1506 from nasa/table-parse-change

Browse Source 
[Table] parse/format with datum
This commit is contained in:
Andrew Henry
2017-04-27 11:43:40 -07:00
committed by GitHub
parent 058dfb0c87 2b41321c03
commit bcdad3f19c
3 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/features/table/src/TableConfiguration.js
View File

@ -65,9 +65,8 @@ define(
limitEvaluator && limitEvaluator &&
limitEvaluator.evaluate(telemetryDatum, metadatum); limitEvaluator.evaluate(telemetryDatum, metadatum);
var value = { var value = {
text: formatter ? formatter.format(telemetryDatum[metadatum.key]) text: formatter.format(telemetryDatum),
: telemetryDatum[metadatum.key], value: formatter.parse(telemetryDatum)
value: telemetryDatum[metadatum.key]
}; };
if (alarm) { if (alarm) {

29
platform/features/table/test/TableConfigurationSpec.js
View File

@ -30,7 +30,6 @@ define(
var mockDomainObject, var mockDomainObject,
mockAPI, mockAPI,
mockTelemetryAPI, mockTelemetryAPI,
mockTelemetryFormatter,
table, table,
mockModel; mockModel;
@ -48,21 +47,27 @@ define(
}; };
}); });
mockTelemetryFormatter = jasmine.createSpyObj('telemetryFormatter',
[
'format'
]);
mockTelemetryFormatter.format.andCallFake(function (valueIn) {
return valueIn;
});
mockTelemetryAPI = jasmine.createSpyObj('telemetryAPI', [ mockTelemetryAPI = jasmine.createSpyObj('telemetryAPI', [
'getValueFormatter' 'getValueFormatter'
]); ]);
mockAPI = { mockAPI = {
telemetry: mockTelemetryAPI telemetry: mockTelemetryAPI
}; };
mockTelemetryAPI.getValueFormatter.andReturn(mockTelemetryFormatter); mockTelemetryAPI.getValueFormatter.andCallFake(function (metadata) {
var formatter = jasmine.createSpyObj(
'telemetryFormatter:' + metadata.key,
[
'format',
'parse'
]
);
var getter = function (datum) {
return datum[metadata.key];
};
formatter.format.andCallFake(getter);
formatter.parse.andCallFake(getter);
return formatter;
});
table = new Table(mockDomainObject, mockAPI); table = new Table(mockDomainObject, mockAPI);
}); });
@ -176,10 +181,6 @@ define(
expect(rowValues['Range 1'].cssClass).toEqual("alarm-class"); expect(rowValues['Range 1'].cssClass).toEqual("alarm-class");
}); });
it("Uses telemetry formatter to appropriately format" +
" telemetry values", function () {
expect(mockTelemetryFormatter.format).toHaveBeenCalled();
});
}); });
}); });
}); });

16
platform/features/table/test/controllers/TelemetryTableControllerSpec.js
View File

@ -101,7 +101,21 @@ define(
]); ]);
mockTelemetryAPI.commonValuesForHints.andReturn([]); mockTelemetryAPI.commonValuesForHints.andReturn([]);
mockTelemetryAPI.request.andReturn(Promise.resolve([])); mockTelemetryAPI.request.andReturn(Promise.resolve([]));
mockTelemetryAPI.getValueFormatter.andCallFake(function (metadata) {
var formatter = jasmine.createSpyObj(
'telemetryFormatter:' + metadata.key,
[
'format',
'parse'
]
);
var getter = function (datum) {
return datum[metadata.key];
};
formatter.format.andCallFake(getter);
formatter.parse.andCallFake(getter);
return formatter;
});
mockTelemetryAPI.canProvideTelemetry.andReturn(false); mockTelemetryAPI.canProvideTelemetry.andReturn(false);