ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-02 01:08:13 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixes tests

Browse Source
This commit is contained in:
Joshi 2020-01-28 10:36:13 -08:00
parent f42ec7e2c5
commit b3488c54cd
3 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/condition/ConditionSpec.js
View File

@ -64,7 +64,8 @@ describe("The condition", function () {
openmct.telemetry.getMetadata.and.returnValue(testTelemetryObject.telemetry.values); openmct.telemetry.getMetadata.and.returnValue(testTelemetryObject.telemetry.values);
testConditionDefinition = { testConditionDefinition = {
trigger: TRIGGER.ANY, definition: {
trigger: 'any',
criteria: [ criteria: [
{ {
operation: 'equalTo', operation: 'equalTo',
@ -73,6 +74,7 @@ describe("The condition", function () {
key: testTelemetryObject.identifier key: testTelemetryObject.identifier
} }
] ]
}
}; };
conditionObj = new Condition( conditionObj = new Condition(
@ -85,7 +87,7 @@ describe("The condition", function () {
}); });
it("generates criteria with an id", function () { it("generates criteria with an id", function () {
const testCriterion = testConditionDefinition.criteria[0]; const testCriterion = testConditionDefinition.definition.criteria[0];
let criterion = conditionObj.generateCriterion(testCriterion); let criterion = conditionObj.generateCriterion(testCriterion);
expect(criterion.id).toBeDefined(); expect(criterion.id).toBeDefined();
expect(criterion.operation).toEqual(testCriterion.operation); expect(criterion.operation).toEqual(testCriterion.operation);
@ -101,15 +103,15 @@ describe("The condition", function () {
it("initializes with criteria from the condition definition", function () { it("initializes with criteria from the condition definition", function () {
expect(conditionObj.criteria.length).toEqual(1); expect(conditionObj.criteria.length).toEqual(1);
let criterion = conditionObj.criteria[0]; let criterion = conditionObj.criteria[0];
console.log(criterion);
expect(criterion instanceof TelemetryCriterion).toBeTrue(); expect(criterion instanceof TelemetryCriterion).toBeTrue();
expect(criterion.operator).toEqual(testConditionDefinition.operator); expect(criterion.operator).toEqual(testConditionDefinition.definition.criteria[0].operator);
expect(criterion.input).toEqual(testConditionDefinition.input); expect(criterion.input).toEqual(testConditionDefinition.definition.criteria[0].input);
expect(criterion.metaDataKey).toEqual(testConditionDefinition.metaDataKey); expect(criterion.metaDataKey).toEqual(testConditionDefinition.definition.criteria[0].metaDataKey);
expect(criterion.key).toEqual(testConditionDefinition.key);
}); });
it("initializes with the trigger from the condition definition", function () { it("initializes with the trigger from the condition definition", function () {
expect(conditionObj.trigger).toEqual(testConditionDefinition.trigger); expect(conditionObj.trigger).toEqual(testConditionDefinition.definition.trigger);
}); });
it("destroys all criteria for a condition", function () { it("destroys all criteria for a condition", function () {

3
src/plugins/condition/criterion/TelemetryCriterion.js
View File

@ -77,8 +77,9 @@ export default class TelemetryCriterion extends EventEmitter {
let params = []; let params = [];
let result = false; let result = false;
params.push(data[this.metaDataKey]); params.push(data[this.metaDataKey]);
if (this.input instanceof Array && this.input.length) {
params.push(this.input[0]); params.push(this.input[0]);
console.log(params); }
if (typeof comparator === 'function') { if (typeof comparator === 'function') {
result = comparator(params); result = comparator(params);
} }

11
src/plugins/condition/criterion/TelemetryCriterionSpec.js
View File

@ -94,17 +94,6 @@ describe("The telemetry criterion", function () {
expect(telemetryCriterion.subscription).toBeDefined(); expect(telemetryCriterion.subscription).toBeDefined();
}); });
it("normalizes telemetry data", function () {
let result = telemetryCriterion.normalizeData({
key: 'some-key',
source: 'testSource',
testSource: 'Hello'
});
expect(result).toEqual({
'some-key': 'Hello'
})
});
it("emits update event on new data from telemetry providers", function () { it("emits update event on new data from telemetry providers", function () {
spyOn(telemetryCriterion, 'emitEvent').and.callThrough(); spyOn(telemetryCriterion, 'emitEvent').and.callThrough();
telemetryCriterion.handleSubscription({ telemetryCriterion.handleSubscription({