Merge branch 'feature/json-validation' into develop

Conflicts:
	src/leap/eip/config.py
	src/leap/eip/specs.py

3 files changed, 118 insertions, 26 deletions

diff --git a/src/leap/base/tests/test_config.py b/src/leap/base/tests/test_config.py
index bede5ea1..d03149b2 100644
--- a/src/leap/base/tests/test_config.py
+++ b/src/leap/base/tests/test_config.py
@@ -38,14 +38,14 @@ class JSONLeapConfigTest(BaseLeapTest):
 
         class DummyTestConfig(config.JSONLeapConfig):
             __metaclass__ = config.MetaConfigWithSpec
-            spec = {}
+            spec = {'properties': {}}
         with self.assertRaises(exceptions.ImproperlyConfigured) as exc:
             DummyTestConfig()
             exc.startswith("missing slug")
 
         class DummyTestConfig(config.JSONLeapConfig):
             __metaclass__ = config.MetaConfigWithSpec
-            spec = {}
+            spec = {'properties': {}}
             slug = "foo"
         DummyTestConfig()
 
diff --git a/src/leap/base/tests/test_providers.py b/src/leap/base/tests/test_providers.py
index 9e0ff90c..8d3b8847 100644
--- a/src/leap/base/tests/test_providers.py
+++ b/src/leap/base/tests/test_providers.py
@@ -1,35 +1,39 @@
+import copy
 import json
 try:
     import unittest2 as unittest
 except ImportError:
     import unittest
-
 import os
 
+import jsonschema
+
 from leap import __branding as BRANDING
 from leap.testing.basetest import BaseLeapTest
 from leap.base import providers
 
 
 EXPECTED_DEFAULT_CONFIG = {
-    "api_version": "0.1.0",
-    "description": "test provider",
-    "display_name": "test provider",
-    "domain": "testprovider.example.org",
-    "enrollment_policy": "open",
-    "serial": 1,
-    "services": [
-        "eip"
+    u"api_version": u"0.1.0",
+    u"description": {u'en': u"Test provider"},
+    u"display_name": {u'en': u"Test Provider"},
+    u"domain": u"testprovider.example.org",
+    u"enrollment_policy": u"open",
+    u"serial": 1,
+    u"services": [
+        u"eip"
     ],
-    "version": "0.1.0"
+    u"languages": [u"en"],
+    u"version": u"0.1.0"
 }
 
 
 class TestLeapProviderDefinition(BaseLeapTest):
     def setUp(self):
         self.definition = providers.LeapProviderDefinition()
-        #XXX change to self.definition.config when property is fixed
-        self.config = self.definition.get_config()
+        self.definition.save()
+        self.definition.load()
+        self.config = self.definition.config
 
     def tearDown(self):
         if hasattr(self, 'testfile') and os.path.isfile(self.testfile):
@@ -57,6 +61,7 @@ class TestLeapProviderDefinition(BaseLeapTest):
         self.testfile = self.get_tempfile('test.json')
         self.definition.save(to=self.testfile)
         deserialized = json.load(open(self.testfile, 'rb'))
+        self.maxDiff = None
         self.assertEqual(deserialized, EXPECTED_DEFAULT_CONFIG)
 
     def test_provider_dump_to_slug(self):
@@ -78,6 +83,13 @@ class TestLeapProviderDefinition(BaseLeapTest):
         self.assertDictEqual(self.config,
                              EXPECTED_DEFAULT_CONFIG)
 
+    def test_provider_validation(self):
+        self.definition.validate(self.config)
+        _config = copy.deepcopy(self.config)
+        _config['serial'] = 'aaa'
+        with self.assertRaises(jsonschema.ValidationError):
+            self.definition.validate(_config)
+
     @unittest.skip
     def test_load_malformed_json_definition(self):
         raise NotImplementedError
@@ -89,18 +101,6 @@ class TestLeapProviderDefinition(BaseLeapTest):
         raise NotImplementedError
 
 
-class TestLeapProvider(BaseLeapTest):
-    def setUp(self):
-        pass
-
-    def tearDown(self):
-        pass
-
-    ###
-
-    # XXX ??
-
-
 class TestLeapProviderSet(BaseLeapTest):
 
     def setUp(self):
diff --git a/src/leap/base/tests/test_validation.py b/src/leap/base/tests/test_validation.py
new file mode 100644
index 00000000..87e99648
--- /dev/null
+++ b/src/leap/base/tests/test_validation.py
@@ -0,0 +1,92 @@
+import copy
+import datetime
+#import json
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+import os
+
+import jsonschema
+
+from leap.base.config import JSONLeapConfig
+from leap.base import pluggableconfig
+from leap.testing.basetest import BaseLeapTest
+
+SAMPLE_CONFIG_DICT = {
+    'prop_one': 1,
+    'prop_uri': "http://example.org",
+    'prop_date': '2012-12-12',
+}
+
+EXPECTED_CONFIG = {
+    'prop_one': 1,
+    'prop_uri': "http://example.org",
+    'prop_date': datetime.datetime(2012, 12, 12)
+}
+
+sample_spec = {
+    'description': 'sample schema definition',
+    'type': 'object',
+    'properties': {
+        'prop_one': {
+            'type': int,
+            'default': 1,
+            'required': True
+        },
+        'prop_uri': {
+            'type': str,
+            'default': 'http://example.org',
+            'required': True,
+            'format': 'uri'
+        },
+        'prop_date': {
+            'type': str,
+            'default': '2012-12-12',
+            'format': 'date'
+        }
+    }
+}
+
+
+class SampleConfig(JSONLeapConfig):
+    spec = sample_spec
+
+    @property
+    def slug(self):
+        return os.path.expanduser('~/sampleconfig.json')
+
+
+class TestJSONLeapConfigValidation(BaseLeapTest):
+    def setUp(self):
+        self.sampleconfig = SampleConfig()
+        self.sampleconfig.save()
+        self.sampleconfig.load()
+        self.config = self.sampleconfig.config
+
+    def tearDown(self):
+        if hasattr(self, 'testfile') and os.path.isfile(self.testfile):
+            os.remove(self.testfile)
+
+    # tests
+
+    def test_good_validation(self):
+        self.sampleconfig.validate(SAMPLE_CONFIG_DICT)
+
+    def test_broken_int(self):
+        _config = copy.deepcopy(SAMPLE_CONFIG_DICT)
+        _config['prop_one'] = '1'
+        with self.assertRaises(jsonschema.ValidationError):
+            self.sampleconfig.validate(_config)
+
+    def test_format_property(self):
+        # JsonSchema Validator does not check the format property.
+        # We should have to extend the Configuration class
+        blah = copy.deepcopy(SAMPLE_CONFIG_DICT)
+        blah['prop_uri'] = 'xxx'
+        with self.assertRaises(pluggableconfig.TypeCastException):
+            self.sampleconfig.validate(blah)
+
+
+if __name__ == "__main__":
+    unittest.main()