From 39d7dc8372a9a4d8e514e3f103b50a74a8f45aba Mon Sep 17 00:00:00 2001
From: Joshi <simplyrender@gmail.com>
Date: Wed, 25 Mar 2020 15:50:16 -0700
Subject: [PATCH] Adds unit tests for isOneOf and isNotOneOf

---
 src/plugins/condition/utils/operations.js     |  7 +-
 src/plugins/condition/utils/operationsSpec.js | 68 +++++++++++++++++++
 2 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 src/plugins/condition/utils/operationsSpec.js

diff --git a/src/plugins/condition/utils/operations.js b/src/plugins/condition/utils/operations.js
index 49d23365b6..5546fcff90 100644
--- a/src/plugins/condition/utils/operations.js
+++ b/src/plugins/condition/utils/operations.js
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 export const OPERATIONS = [
     {
         name: 'equalTo',
@@ -207,7 +209,7 @@ export const OPERATIONS = [
         name: 'valueIs',
         operation: function (input) {
             const values = input[1].split(',');
-            return values.find((value) => input[0].toString() === value.toString().replace(' ', ''));
+            return values.find((value) => input[0].toString() === _.trim(value.toString()));
         },
         text: 'is one of',
         appliesTo: ["string", "number"],
@@ -220,7 +222,8 @@ export const OPERATIONS = [
         name: 'valueIsNot',
         operation: function (input) {
             const values = input[1].split(',');
-            return values.find((value) => input[0].toString() !== value.toString().replace(' ', ''));
+            const found = values.find((value) => input[0].toString() === _.trim(value.toString()));
+            return !found;
         },
         text: 'is not one of',
         appliesTo: ["string", "number"],
diff --git a/src/plugins/condition/utils/operationsSpec.js b/src/plugins/condition/utils/operationsSpec.js
new file mode 100644
index 0000000000..0f82adca92
--- /dev/null
+++ b/src/plugins/condition/utils/operationsSpec.js
@@ -0,0 +1,68 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2020, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+import { OPERATIONS } from "./operations";
+let isOneOfOperation = OPERATIONS.find((operation) => operation.name === 'valueIs');
+let isNotOneOfOperation = OPERATIONS.find((operation) => operation.name === 'valueIsNot');
+
+describe('Is one of and is not one of operations', function () {
+
+    it('should evaluate isOneOf to true for number inputs', () => {
+        const inputs = [45, "5,6,45,8"];
+        expect(!!isOneOfOperation.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate isOneOf to true for string inputs', () => {
+        const inputs = ["45", " 45, 645, 4,8 "];
+        expect(!!isOneOfOperation.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate isNotOneOf to true for number inputs', () => {
+        const inputs = [45, "5,6,4,8"];
+        expect(!!isNotOneOfOperation.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate isNotOneOf to true for string inputs', () => {
+        const inputs = ["45", " 5,645, 4,8 "];
+        expect(!!isNotOneOfOperation.operation(inputs)).toBeTrue();
+    });
+
+    it('should evaluate isOneOf to false for number inputs', () => {
+        const inputs = [4, "5, 6, 7, 8"];
+        expect(!!isOneOfOperation.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate isOneOf to false for string inputs', () => {
+        const inputs = ["4", "5,645 ,7,8"];
+        expect(!!isOneOfOperation.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate isNotOneOf to false for number inputs', () => {
+        const inputs = [4, "5,4, 7,8"];
+        expect(!!isNotOneOfOperation.operation(inputs)).toBeFalse();
+    });
+
+    it('should evaluate isNotOneOf to false for string inputs', () => {
+        const inputs = ["4", "5,46,4,8"];
+        expect(!!isNotOneOfOperation.operation(inputs)).toBeFalse();
+    });
+});