Add cli schema validation tests

Author: hardbyte

tests/__init__.py

@@ -3,25 +3,27 @@
 import tempfile
 import clkhash
 
-SIMPLE_SCHEMA_PATH = os.path.join(
+TESTDATA = os.path.join(
     os.path.dirname(__file__),
-    'testdata',
-    'simple-schema.json'
-)
-SAMPLE_DATA_SCHEMA_PATH = os.path.join(
-    os.path.dirname(__file__),
-    'testdata',
-    'dirty-data-schema.json'
+    'testdata'
 )
 
+SIMPLE_SCHEMA_PATH = os.path.join(TESTDATA, 'simple-schema.json')
+
+SAMPLE_DATA_SCHEMA_PATH = os.path.join(TESTDATA, 'dirty-data-schema.json')
+
+GOOD_SCHEMA_V1_PATH = os.path.join(TESTDATA, 'good-schema-v1.json')
+GOOD_SCHEMA_V2_PATH = os.path.join(TESTDATA, 'good-schema-v2.json')
+BAD_SCHEMA_V1_PATH = os.path.join(TESTDATA, 'bad-schema-v1.json')
+BAD_SCHEMA_V2_PATH = os.path.join(TESTDATA, 'bad-schema-v2.json')
+
 RANDOMNAMES_SCHEMA_PATH = os.path.join(
-    os.path.dirname(clkhash.__file__),
-    'data',
-    'randomnames-schema.json'
+    TESTDATA,
+    'randomnames-schema-v2.json'
 )
 
-SAMPLE_DATA_PATH_1 = os.path.join(os.path.dirname(__file__), 'testdata', 'dirty_1000_50_1.csv')
-SAMPLE_DATA_PATH_2 = os.path.join(os.path.dirname(__file__), 'testdata', 'dirty_1000_50_2.csv')
+SAMPLE_DATA_PATH_1 = os.path.join(TESTDATA, 'dirty_1000_50_1.csv')
+SAMPLE_DATA_PATH_2 = os.path.join(TESTDATA, 'dirty_1000_50_2.csv')
 
 
 class temporary_file(object):

tests/test_cli.py

@@ -18,7 +18,7 @@
 import clkhash.cli
 from clkhash import randomnames
 
-from tests import temporary_file, create_temp_file, SIMPLE_SCHEMA_PATH, RANDOMNAMES_SCHEMA_PATH
+from tests import *
 
 
 class CLITestHelper(unittest.TestCase):
@@ -100,7 +100,9 @@ class BasicCLITests(unittest.TestCase):
     def test_list_commands(self):
         runner = CliRunner()
         result = runner.invoke(clkhash.cli.cli, [])
-        for expected_command in 'hash', 'upload', 'create', 'results', 'generate', 'benchmark':
+        expected_commands = ['benchmark', 'create', 'create-project', 'generate',
+                             'hash', 'upload',  'results', 'validate-schema']
+        for expected_command in expected_commands:
             assert expected_command in result.output
 
     def test_version(self):
@@ -135,6 +137,43 @@ def test_bench(self):
         assert 'hashes in' in result.output
 
 
+class TestSchemaValidationCommand(unittest.TestCase):
+
+    @staticmethod
+    def validate_schema(schema_path):
+        runner = CliRunner()
+        result = runner.invoke(clkhash.cli.cli, [
+            'validate-schema', schema_path
+        ])
+        return result
+
+    def test_good_v1_schema(self):
+        for schema_path in GOOD_SCHEMA_V1_PATH, SIMPLE_SCHEMA_PATH:
+            result = self.validate_schema(schema_path)
+            assert result.exit_code == 0
+            assert 'schema is valid' in result.output
+
+    def test_bad_v1_schema(self):
+        result = self.validate_schema(BAD_SCHEMA_V1_PATH)
+        assert result.exit_code == -1
+        assert 'schema is not valid.' in result.output
+        assert "'l' is a required property" in result.output
+
+
+    def test_good_v2_schema(self):
+        for schema_path in GOOD_SCHEMA_V2_PATH, RANDOMNAMES_SCHEMA_PATH:
+            result = self.validate_schema(schema_path)
+            assert result.exit_code == 0
+            assert 'schema is valid' in result.output
+
+    def test_bad_v1_schema(self):
+        result = self.validate_schema(BAD_SCHEMA_V2_PATH)
+        assert result.exit_code == -1
+        assert 'schema is not valid.' in result.output
+        assert "in schema['properties']['features']['items']" in result.output
+
+
+
 @unittest.skipUnless("INCLUDE_CLI" in os.environ,
                      "Set envvar INCLUDE_CLI to run. Disabled for jenkins")
 class TestHashCommand(unittest.TestCase):