sample organised

impratikjaiswal · Jun 17, 2024 · bf9ce99 · bf9ce99
1 parent 0462006
commit bf9ce99
Show file tree

Hide file tree

Showing 7 changed files with 4,701 additions and 3,238 deletions.
diff --git a/asn1_play/_version.py b/asn1_play/_version.py
@@ -7,5 +7,5 @@
 
 from incremental import Version
 
-__version__ = Version("asn1_play", 7, 0, 0)
+__version__ = Version("asn1_play", 8, 0, 0)
 __all__ = ["__version__"]
diff --git a/asn1_play/main/data_type/data_type_master.py b/asn1_play/main/data_type/data_type_master.py
@@ -232,14 +232,20 @@ def to_dic(self, data):
         :return:
         """
         set_defaults(data, None)
-        return {
+        asn1_data = {}
+        if data.asn1_element and isinstance(data.asn1_element, Asn1):
+            asn1_data.update({PhKeys.ASN1_SCHEMA: data.asn1_element.asn1_schema.get_name()})
+            asn1_data.update({PhKeys.ASN1_OBJECT: data.asn1_element.asn1_object})
+            asn1_data.update({PhKeys.ASN1_OBJECT_ALTERNATE: data.asn1_element.asn1_object_alternate})
+            asn1_data.update({PhKeys.FETCH_ASN1_OBJECTS_LIST: data.asn1_element.fetch_asn1_objects_list})
+        common_data = {
             PhKeys.INPUT_DATA: data.input_data,
             PhKeys.REMARKS: data.get_remarks_as_str(),
             PhKeys.DATA_GROUP: data.data_group,
             PhKeys.INPUT_FORMAT: data.input_format,
             PhKeys.OUTPUT_FORMAT: data.output_format,
-            PhKeys.ASN1_ELEMENT: data.asn1_element,
             PhKeys.OUTPUT_FILE: data.output_file,
             PhKeys.RE_PARSE_OUTPUT: data.re_parse_output,
             PhKeys.OUTPUT_FILE_NAME_KEYWORD: data.output_file_name_keyword,
         }
+        return {**common_data, **asn1_data}
diff --git a/asn1_play/main/data_type/sample.py b/asn1_play/main/data_type/sample.py
@@ -120,8 +120,7 @@ def set_data_pool(self):
             #
             Data(
                 remarks='Asn1 Objects Static List; v3_1',
-                asn1_element=Asn1(Asn1Versions.GSMA_SGP_22_v3_1),
-                FETCH_ASN1_OBJECTS_LIST=True
+                asn1_element=Asn1(Asn1Versions.GSMA_SGP_22_v3_1, fetch_asn1_objects_list=True),
             ),
             #
             Data(

diff --git a/asn1_play/test/log/pycharm_SGP22_v2_4-epp_v3_2.log b/asn1_play/test/log/pycharm_SGP22_v2_4-epp_v3_2.log
diff --git a/asn1_play/test/log/pycharm_SGP22_v3_0_0-epp_v3_1.log b/asn1_play/test/log/pycharm_SGP22_v3_0_0-epp_v3_1.log
diff --git a/asn1_play/test/log/pycharm_SGP22_v3_0_0-epp_v3_2.log b/asn1_play/test/log/pycharm_SGP22_v3_0_0-epp_v3_2.log
diff --git a/asn1_play/test/log/pycharm_SGP22_v3_0_0-epp_v3_2_debug.log b/asn1_play/test/log/pycharm_SGP22_v3_0_0-epp_v3_2_debug.log