Update tests

Author: edan-bainglass

tests/orm/data/code/test_abstract.py

@@ -72,4 +72,4 @@ def test_serialization():
     label = 'some-label'
     code = MockCode(label=label)
 
-    MockCode.from_serialized(**code.serialize())
+    MockCode.from_serialized(unstored=True, **code.serialize(unstored=True))

tests/orm/data/code/test_installed.py

@@ -152,4 +152,4 @@ def test_serialization(aiida_localhost, bash_path):
     """Test the deprecated :meth:`aiida.orm.nodes.data.code.installed.InstalledCode.get_execname` method."""
     code = InstalledCode(label='some-label', computer=aiida_localhost, filepath_executable=str(bash_path.absolute()))
 
-    InstalledCode.from_serialized(**code.serialize())
+    InstalledCode.from_serialized(unstored=True, **code.serialize(unstored=True))

tests/orm/data/code/test_portable.py

@@ -145,4 +145,4 @@ def test_serialization(tmp_path, chdir_tmp_path):
     (filepath_files / 'subdir').mkdir()
     (filepath_files / 'subdir/test').write_text('test')
     code = PortableCode(label='some-label', filepath_executable='bash', filepath_files=filepath_files)
-    PortableCode.from_serialized(**code.serialize())
+    PortableCode.from_serialized(unstored=True, **code.serialize(unstored=True))

tests/orm/models/test_models.py

@@ -169,18 +169,18 @@ def test_roundtrip(required_arguments, tmp_path):
     assert isinstance(entity, cls)
 
     # Get the model instance from the entity instance
-    model = entity._to_model(tmp_path)
+    model = entity.to_model(tmp_path, unstored=True)
     assert isinstance(model, BaseModel)
 
     # Reconstruct the entity instance from the model instance
-    roundtrip = cls._from_model(model)
+    roundtrip = cls.from_model(model)
     assert isinstance(roundtrip, cls)
 
     # Get the model instance again from the reconstructed entity and check that the fields that would be passed to the
     # ORM entity constructor are identical of the original model. The ``model_to_orm_field_values`` excludes values of
     # fields that define ``exclude_to_orm=True`` because these can change during roundtrips. This because these
     # typically correspond to entity fields that have defaults set on the database level, e.g., UUIDs.
-    roundtrip_model = roundtrip._to_model(tmp_path)
+    roundtrip_model = roundtrip.to_model(tmp_path, unstored=True)
     original_field_values = cls.model_to_orm_field_values(model)
 
     for key, value in cls.model_to_orm_field_values(roundtrip_model).items():
@@ -206,5 +206,5 @@ def test_roundtrip_serialization(required_arguments, tmp_path):
     assert isinstance(entity, cls)
 
     # Get the model instance from the entity instance
-    serialized_entity = entity.serialize(tmp_path)
-    entity.from_serialized(**serialized_entity)
+    serialized_entity = entity.serialize(tmp_path, unstored=True, mode='python')
+    entity.from_serialized(unstored=True, **serialized_entity)

tests/orm/test_fields/fields_AuthInfo.yml

@@ -2,5 +2,5 @@ auth_params: QbDictField('auth_params', dtype=typing.Dict[str, typing.Any], is_a
 computer: QbNumericField('computer', dtype=<class 'int'>, is_attribute=False)
 enabled: QbField('enabled', dtype=<class 'bool'>, is_attribute=False)
 metadata: QbDictField('metadata', dtype=typing.Dict[str, typing.Any], is_attribute=False)
-pk: QbNumericField('pk', dtype=typing.Optional[int], is_attribute=False)
+pk: QbNumericField('pk', dtype=<class 'int'>, is_attribute=False)
 user: QbNumericField('user', dtype=<class 'int'>, is_attribute=False)

tests/orm/test_fields/fields_Comment.yml

@@ -1,7 +1,7 @@
 content: QbStrField('content', dtype=<class 'str'>, is_attribute=False)
-ctime: QbNumericField('ctime', dtype=typing.Optional[datetime.datetime], is_attribute=False)
-mtime: QbNumericField('mtime', dtype=typing.Optional[datetime.datetime], is_attribute=False)
+ctime: QbNumericField('ctime', dtype=<class 'datetime.datetime'>, is_attribute=False)
+mtime: QbNumericField('mtime', dtype=<class 'datetime.datetime'>, is_attribute=False)
 node: QbNumericField('node', dtype=<class 'int'>, is_attribute=False)
-pk: QbNumericField('pk', dtype=typing.Optional[int], is_attribute=False)
+pk: QbNumericField('pk', dtype=<class 'int'>, is_attribute=False)
 user: QbNumericField('user', dtype=<class 'int'>, is_attribute=False)
-uuid: QbStrField('uuid', dtype=typing.Optional[str], is_attribute=False)
+uuid: QbField('uuid', dtype=<class 'uuid.UUID'>, is_attribute=False)

tests/orm/test_fields/fields_Computer.yml

@@ -2,7 +2,7 @@ description: QbStrField('description', dtype=<class 'str'>, is_attribute=False)
 hostname: QbStrField('hostname', dtype=<class 'str'>, is_attribute=False)
 label: QbStrField('label', dtype=<class 'str'>, is_attribute=False)
 metadata: QbDictField('metadata', dtype=typing.Dict[str, typing.Any], is_attribute=False)
-pk: QbNumericField('pk', dtype=typing.Optional[int], is_attribute=False)
+pk: QbNumericField('pk', dtype=<class 'int'>, is_attribute=False)
 scheduler_type: QbStrField('scheduler_type', dtype=<class 'str'>, is_attribute=False)
 transport_type: QbStrField('transport_type', dtype=<class 'str'>, is_attribute=False)
-uuid: QbStrField('uuid', dtype=<class 'str'>, is_attribute=False)
+uuid: QbField('uuid', dtype=<class 'uuid.UUID'>, is_attribute=False)

tests/orm/test_fields/fields_Group.yml

@@ -1,9 +1,9 @@
-description: QbStrField('description', dtype=typing.Optional[str], is_attribute=False)
-extras: QbDictField('extras', dtype=typing.Optional[typing.Dict[str, typing.Any]],
-  is_attribute=False, is_subscriptable=True)
+description: QbStrField('description', dtype=<class 'str'>, is_attribute=False)
+extras: QbDictField('extras', dtype=typing.Dict[str, typing.Any], is_attribute=False,
+  is_subscriptable=True)
 label: QbStrField('label', dtype=<class 'str'>, is_attribute=False)
-pk: QbNumericField('pk', dtype=typing.Optional[int], is_attribute=False)
-time: QbNumericField('time', dtype=typing.Optional[datetime.datetime], is_attribute=False)
+pk: QbNumericField('pk', dtype=<class 'int'>, is_attribute=False)
+time: QbNumericField('time', dtype=<class 'datetime.datetime'>, is_attribute=False)
 type_string: QbStrField('type_string', dtype=<class 'str'>, is_attribute=False)
 user: QbNumericField('user', dtype=<class 'int'>, is_attribute=False)
-uuid: QbStrField('uuid', dtype=<class 'str'>, is_attribute=False)
+uuid: QbField('uuid', dtype=<class 'uuid.UUID'>, is_attribute=False)

tests/orm/test_fields/fields_Log.yml

@@ -3,6 +3,6 @@ levelname: QbStrField('levelname', dtype=<class 'str'>, is_attribute=False)
 loggername: QbStrField('loggername', dtype=<class 'str'>, is_attribute=False)
 message: QbStrField('message', dtype=<class 'str'>, is_attribute=False)
 metadata: QbDictField('metadata', dtype=typing.Dict[str, typing.Any], is_attribute=False)
-pk: QbNumericField('pk', dtype=typing.Optional[int], is_attribute=False)
+pk: QbNumericField('pk', dtype=<class 'int'>, is_attribute=False)
 time: QbNumericField('time', dtype=<class 'datetime.datetime'>, is_attribute=False)
-uuid: QbStrField('uuid', dtype=<class 'str'>, is_attribute=False)
+uuid: QbField('uuid', dtype=<class 'uuid.UUID'>, is_attribute=False)

tests/orm/test_fields/fields_User.yml

@@ -2,4 +2,4 @@ email: QbStrField('email', dtype=<class 'str'>, is_attribute=False)
 first_name: QbStrField('first_name', dtype=<class 'str'>, is_attribute=False)
 institution: QbStrField('institution', dtype=<class 'str'>, is_attribute=False)
 last_name: QbStrField('last_name', dtype=<class 'str'>, is_attribute=False)
-pk: QbNumericField('pk', dtype=typing.Optional[int], is_attribute=False)
+pk: QbNumericField('pk', dtype=<class 'int'>, is_attribute=False)