Fix #73: Add choice validation for numbers and strings

Author: bhch

src/dataValidation.js

@@ -1,4 +1,4 @@
-import {normalizeKeyword, getKeyword, getKey, joinCoords, getSchemaType} from './util';
+import {normalizeKeyword, getKeyword, getKey, joinCoords, getSchemaType, valueInChoices} from './util';
 import {JOIN_SYMBOL} from './constants';
 import EditorState from './editorState';
 
@@ -255,11 +255,15 @@ export default function DataValidator(schema) {
         if ((schema.maxLength || schema.maxLength == 0) && data.length > parseInt(schema.maxLength))
             this.addError(coords, 'This value may not be longer than ' + schema.maxLength + ' characters.');
 
+        if (!valueInChoices(schema, data)) {
+            this.addError(coords, 'Invalid choice "' + data + '"');
+            return;
+        }
+
         let format = normalizeKeyword(schema.format);
         let format_invalid = false;
         let format_validator;
 
-
         switch (format) {
             case 'email':
                 format_validator = this.validateEmail;
@@ -340,6 +344,11 @@ export default function DataValidator(schema) {
 
         if ((schema.multipleOf || schema.multipleOf === 0) && ((data * 100) % (schema.multipleOf * 100)) / 100)
             this.addError(coords, 'This value must be a multiple of ' + schema.multipleOf);
+
+        if (!valueInChoices(schema, data)) {
+            this.addError(coords, 'Invalid choice "' + data + '"');
+            return;
+        }
     };
 
     this.validateEmail = function(schema, data, coords) {

tests/dataValidation.test.js

@@ -542,6 +542,13 @@ test('validateString method', () => {
     schema['properties']['a']['required'] = false;
     data = {'a': ''}
     expect(validator.validate(data).isValid).toBe(true);
+
+    // 8. test invalid choice
+    schema['properties']['a']['choices'] = ['one', 'two'];
+    wrong_data = {'a': 'xxx'};
+    expect(validator.validate(wrong_data).isValid).toBe(false);
+    data = {'a': 'two'};
+    expect(validator.validate(data).isValid).toBe(true);
 });
 
 /* :TODO: Enable these tests later after writing format validations.
@@ -748,6 +755,16 @@ test('validateInteger method', () => {
     validator = new DataValidator(schema);
     expect(validator.validate(wrong_data).isValid).toBe(false);
     expect(validator.validate(data).isValid).toBe(true);
+
+    // 11. test invalid choice
+    delete schema['properties']['a']['exclusiveMinimum'];
+    delete schema['properties']['a']['exclusiveMaximum'];
+    delete schema['properties']['a']['multipleOf'];
+    schema['properties']['a']['choices'] = [1, 2];
+    wrong_data = {'a': 3};
+    expect(validator.validate(wrong_data).isValid).toBe(false);
+    data = {'a': 1};
+    expect(validator.validate(data).isValid).toBe(true);
 });
 
 test('validateNumber method', () => {
@@ -868,4 +885,14 @@ test('validateNumber method', () => {
     validator = new DataValidator(schema);
     expect(validator.validate(wrong_data).isValid).toBe(false);
     expect(validator.validate(data).isValid).toBe(true);
+
+    // 10. test invalid choice
+    delete schema['properties']['a']['exclusiveMinimum'];
+    delete schema['properties']['a']['exclusiveMaximum'];
+    delete schema['properties']['a']['multipleOf'];
+    schema['properties']['a']['choices'] = [1, 2];
+    wrong_data = {'a': 3};
+    expect(validator.validate(wrong_data).isValid).toBe(false);
+    data = {'a': 1};
+    expect(validator.validate(data).isValid).toBe(true);
 });