From 0ad2d5992446f6c0818d2e53f9af0369e4734df9 Mon Sep 17 00:00:00 2001
From: Joshi <simplyrender@gmail.com>
Date: Wed, 19 Feb 2020 12:51:15 -0800
Subject: [PATCH] Fixes tests

---
 src/plugins/condition/ConditionSpec.js        | 20 +++++++++----------
 .../criterion/TelemetryCriterionSpec.js       |  4 +---
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/plugins/condition/ConditionSpec.js b/src/plugins/condition/ConditionSpec.js
index 18334bcada..b29cec9dd9 100644
--- a/src/plugins/condition/ConditionSpec.js
+++ b/src/plugins/condition/ConditionSpec.js
@@ -64,14 +64,14 @@ describe("The condition", function () {
         openmct.telemetry.getMetadata.and.returnValue(testTelemetryObject.telemetry.values);
 
         testConditionDefinition = {
-            definition: {
+            configuration: {
                 trigger: TRIGGER.ANY,
                 criteria: [
                     {
                         operation: 'equalTo',
                         input: false,
-                        metaDataKey: 'value',
-                        key: testTelemetryObject.identifier
+                        metadata: 'value',
+                        telemetry: testTelemetryObject.identifier
                     }
                 ]
             }
@@ -87,13 +87,13 @@ describe("The condition", function () {
     });
 
     it("generates criteria with an id", function () {
-        const testCriterion = testConditionDefinition.definition.criteria[0];
+        const testCriterion = testConditionDefinition.configuration.criteria[0];
         let criterion = conditionObj.generateCriterion(testCriterion);
         expect(criterion.id).toBeDefined();
         expect(criterion.operation).toEqual(testCriterion.operation);
         expect(criterion.input).toEqual(testCriterion.input);
-        expect(criterion.metaDataKey).toEqual(testCriterion.metaDataKey);
-        expect(criterion.key).toEqual(testCriterion.key);
+        expect(criterion.metadata).toEqual(testCriterion.metadata);
+        expect(criterion.telemetry).toEqual(testCriterion.telemetry);
     });
 
     it("initializes with an id", function () {
@@ -104,13 +104,13 @@ describe("The condition", function () {
         expect(conditionObj.criteria.length).toEqual(1);
         let criterion = conditionObj.criteria[0];
         expect(criterion instanceof TelemetryCriterion).toBeTrue();
-        expect(criterion.operator).toEqual(testConditionDefinition.definition.criteria[0].operator);
-        expect(criterion.input).toEqual(testConditionDefinition.definition.criteria[0].input);
-        expect(criterion.metaDataKey).toEqual(testConditionDefinition.definition.criteria[0].metaDataKey);
+        expect(criterion.operator).toEqual(testConditionDefinition.configuration.criteria[0].operator);
+        expect(criterion.input).toEqual(testConditionDefinition.configuration.criteria[0].input);
+        expect(criterion.metadata).toEqual(testConditionDefinition.configuration.criteria[0].metadata);
     });
 
     it("initializes with the trigger from the condition definition", function () {
-        expect(conditionObj.trigger).toEqual(testConditionDefinition.definition.trigger);
+        expect(conditionObj.trigger).toEqual(testConditionDefinition.configuration.trigger);
     });
 
     it("destroys all criteria for a condition", function () {
diff --git a/src/plugins/condition/criterion/TelemetryCriterionSpec.js b/src/plugins/condition/criterion/TelemetryCriterionSpec.js
index 123fd600fb..8c9cb67671 100644
--- a/src/plugins/condition/criterion/TelemetryCriterionSpec.js
+++ b/src/plugins/condition/criterion/TelemetryCriterionSpec.js
@@ -64,7 +64,7 @@ describe("The telemetry criterion", function () {
 
         testCriterionDefinition = {
             id: 'test-criterion-id',
-            key: openmct.objects.makeKeyString(testTelemetryObject.identifier)
+            telemetry: openmct.objects.makeKeyString(testTelemetryObject.identifier)
         };
 
         mockListener = jasmine.createSpy('listener');
@@ -85,7 +85,6 @@ describe("The telemetry criterion", function () {
     it("initializes with a telemetry objectId as string", function () {
         telemetryCriterion.initialize(testTelemetryObject);
         expect(telemetryCriterion.telemetryObjectIdAsString).toEqual(testTelemetryObject.identifier.key);
-        expect(telemetryCriterion.telemetryMetadata.length).toEqual(2);
         expect(mockListener2).toHaveBeenCalled();
     });
 
@@ -112,7 +111,6 @@ describe("The telemetry criterion", function () {
         expect(telemetryCriterion.subscription).toBeUndefined();
         expect(telemetryCriterion.telemetryObjectIdAsString).toBeUndefined();
         expect(telemetryCriterion.telemetryObject).toBeUndefined();
-        expect(telemetryCriterion.telemetryMetadata).toBeUndefined();
     });
 
 });