Small refactoring and docs

This commit is contained in:
mvaradi 2018-10-14 10:31:40 +01:00
parent bf3bb72bb8
commit 7d89f1131b
2 changed files with 41 additions and 34 deletions

View file

@ -23,14 +23,14 @@ class TestValidator(unittest.TestCase):
def test_no_file_at_path(self):
validator = Validator("resource_name")
validator.parse_json("invalid_path")
validator._parse_json("invalid_path")
self.assertIn("File error", validator.error_log)
def test_json_parser(self):
validator = Validator("resource_name")
data = validator.parse_json("data/test_data.json")
data = validator._parse_json("data/test_data.json")
self.assertIsNotNone(data)
validator.parse_json("data/test_data_malformed.json")
validator._parse_json("data/test_data_malformed.json")
self.assertIn("JSON error", validator.error_log)
def test_basic_checks(self):
@ -45,22 +45,22 @@ class TestValidator(unittest.TestCase):
def test_no_resource_name(self):
validator = Validator("test")
validator.json_data = {"pdb_id": "1abc"}
self.assertFalse(validator.test_resource())
self.assertFalse(validator._test_resource())
def test_resource_name_mismatch(self):
validator = Validator("test")
validator.json_data = {"data_resource": "test2", "pdb_id": "1abc"}
self.assertFalse(validator.test_resource())
self.assertFalse(validator._test_resource())
def test_no_pdb_id(self):
validator = Validator("test")
validator.json_data = {"data_resource": "test"}
self.assertFalse(validator.test_pdb_id())
self.assertFalse(validator._test_pdb_id())
def test_invalid_pdb_id(self):
validator = Validator("test")
validator.json_data = {"data_resource": "test", "pdb_id": "invalid"}
self.assertFalse(validator.test_pdb_id())
self.assertFalse(validator._test_pdb_id())
def test_json_validation(self):
validator = Validator("ProKinO")