Refactory

Author: davxy

codec/validate.py

@@ -1,22 +1,14 @@
 #!/usr/bin/env python
 
-import asn1tools
-import glob
 import os
 import sys
 
 script_dir = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(os.path.abspath(os.path.join(script_dir, '../jam-types-asn')))
 
-from utils import get_schema_files, validate  # noqa: E402
+from utils import validate_group  # noqa: E402
 
 os.chdir(script_dir)
 
-def validate_spec(spec_name):
-    print(f"[Validating '{spec_name}' spec]")
-    schema = asn1tools.compile_files(get_schema_files(spec_name == "full"), codec="jer")
-    for json_file in glob.glob(f"{spec_name}/*.json"):
-        validate(schema, json_file)
-
-validate_spec("tiny")
-validate_spec("full")
+for spec in ["tiny", "full"]:
+    validate_group("codec", None, spec)

jam-types-asn/utils.py

@@ -27,7 +27,7 @@ def make_asn1_parsable(json_str, json_tweaks_callback):
     return json_str
 
 
-def path_to_schema_name(path):
+def path_to_root_type(path):
     # Strip the directory path and extension
     name = os.path.splitext(os.path.basename(path))[0]   
     # Remove "_X" if it ends with a number
@@ -39,22 +39,22 @@ def path_to_schema_name(path):
     return name    
 
 
-def validate(schema, path, schema_name = None, json_tweaks_callback = None):  
-    print("* Validating: ", path)
+def validate(schema, json_file, root_type = None, json_tweaks_callback = None):  
+    print("* Validating: ", json_file)
 
-    if schema_name is None:
-        schema_name = path_to_schema_name(path)
+    if root_type is None:
+        root_type = path_to_root_type(json_file)
 
     # Decode from json using the schema
-    json_bytes = open(path, "rb").read()
+    json_bytes = open(json_file, "rb").read()
     json_str_org = json_bytes.decode('utf-8')
     json_str_org = make_asn1_parsable(json_str_org, json_tweaks_callback)
 
     json_bytes = json_str_org.encode('utf-8')
-    decoded = schema.decode(schema_name, json_bytes, check_constraints=True)
+    decoded = schema.decode(root_type, json_bytes, check_constraints=True)
 
     # Encode to json using the schema
-    encoded = schema.encode(schema_name, decoded, check_constraints=True)
+    encoded = schema.encode(root_type, decoded, check_constraints=True)
     # Original json uses snake case, asn1 requires kebab case
     json_str = encoded.decode('utf-8')
     json_obj = json.loads(json_str)
@@ -66,7 +66,15 @@ def validate(schema, path, schema_name = None, json_tweaks_callback = None):
 
 def validate_group(group_name, group_schema, spec_name):
     print(f"\n[Validating {group_name} ({spec_name})]")
-    schema = asn1tools.compile_files(get_schema_files(spec_name == "full") + [group_schema], codec="jer")
+    schema_files = get_schema_files(spec_name == "full")
+    if group_schema is not None:
+        schema_files += [group_schema]
+    schema = asn1tools.compile_files(schema_files, codec="jer")
+    # A bit of a hack. Consider passing the schema root type as param
+    if group_name == "codec":
+        root_type = None
+    else:
+        root_type = "TestCase"
     for json_file in glob.glob(f"{spec_name}/*.json"):
-        validate(schema, json_file, "TestCase")
+        validate(schema, json_file, root_type)
 

safrole/validate.py

@@ -10,5 +10,5 @@
 
 os.chdir(script_dir)
 
-validate_group("safrole", "safrole.asn", "tiny")
-validate_group("safrole", "safrole.asn", "full")
+for spec in ["tiny", "full"]:
+    validate_group("safrole", "safrole.asn", spec)

statistics/validate.py

@@ -1,22 +1,14 @@
 #!/usr/bin/env python
 
-import asn1tools
-import glob
 import os
 import sys
 
 script_dir = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(os.path.abspath(os.path.join(script_dir, '../jam-types-asn')))
 
-from utils import get_schema_files, validate  # noqa: E402
+from utils import validate_group  # noqa: E402
 
 os.chdir(script_dir)
 
-def validate_spec(spec_name):
-    print(f"[Validating '{spec_name}' spec]")
-    schema = asn1tools.compile_files(get_schema_files(spec_name == "full") + ["statistics.asn"], codec="jer")
-    for json_file in glob.glob(f"{spec_name}/*.json"):
-        validate(schema, json_file, "TestCase")
-
-validate_spec("tiny")
-validate_spec("full")
+for spec in ["tiny", "full"]:
+    validate_group("statistics", "statistics.asn", spec)