better tests use case for json validator

sonic182 · Sep 16, 2017 · cb99156 · cb99156
1 parent 4c646ad
commit cb99156
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/app/validators/json_schemas.py b/app/validators/json_schemas.py
@@ -33,7 +33,7 @@ def validate(self, data, field='', constrain=None, started=False):
             return res, errors
 
         if err:
-            return (False, {'payload': ERRORS[err]})
+            return (None, {'payload': ERRORS[err]})
 
         my_field = field
         for key in constrain:
@@ -64,8 +64,7 @@ def _key_match(self, obj, rules, key, field, started, res, errors):
                 obj, field, rules.get(
                     'properties', None), started)
 
-            if res2:
-                res[key] = res2
+            res[key] = res2 or {}
 
             if errors2:
                 errors[key] = errors2

diff --git a/tests/components/schema_validator.py b/tests/components/schema_validator.py
@@ -1,6 +1,7 @@
 """Json schemas validator."""
 
 from json import dumps
+from json import loads
 from app.validators.json_schemas import JsonSchemaValidator
 
 
@@ -41,7 +42,7 @@ def test_constrain_primitive():
     """Test constrain primitive types"""
     constrain = {
         'string': {},
-        'integer': {'type': str},
+        'integer': {'type': int},
         'float': {'type': float},
         'boolean': {'type': bool},
         'json': {
@@ -63,23 +64,24 @@ def test_constrain_primitive():
     })
 
     res, err = JsonSchemaValidator(constrain).validate('{as: "df"}')
-    assert err
+    assert err == {'payload': 'INVALID PAYLOAD'}
 
     res, err = JsonSchemaValidator(constrain).validate(json)
-    assert err
+    assert err == {'extra_1': 'Missing field', 'extra_2': 'Missing field'}
     del constrain['extra_1']
     del constrain['extra_2']
 
+    constrain['integer']['type'] = str
     res, err = JsonSchemaValidator(constrain).validate(json)
-    assert err
-    constrain['integer']['type'] = int
+    assert err == {'integer': 'Bad data type'}
 
+    constrain['integer']['type'] = int
     res, err = JsonSchemaValidator(constrain).validate(json)
-    assert res and not err
+    assert res == loads(json)
 
 
 def test_constrain_lists_dicts():
-    """Test constrain primitive types."""
+    """Test nested structures."""
     constrain = {
         'json': {
             'type': dict,
@@ -124,7 +126,19 @@ def test_constrain_lists_dicts():
     })
 
     res, err = JsonSchemaValidator(constrain).validate(json)
-    assert res and err
+    assert res == {
+        'json': {'float': 12.12, 'integer': 42},
+        'list': [
+            {'lastname': 'mogollon', 'name': 'johan'},
+            {'lastname': 'mogollon', 'name': 'johan'},
+            {'age': [12, 24], 'lastname': 'paul', 'name': 'jean'}
+        ]}
+    assert err == {
+        'list': [
+            {'list.0.age': 'Missing field'},
+            {'list.1.age': 'Missing field'}
+        ]
+    }
 
     json = dumps({
         'json': {
@@ -135,4 +149,5 @@ def test_constrain_lists_dicts():
     })
 
     res, err = JsonSchemaValidator(constrain).validate(json)
-    assert res and err
+    assert res == {'json': {'float': 12.12, 'integer': 42}, 'list': []}
+    assert err == {'list': ['Bad data type', 'Bad data type', 'Bad data type']}