test_model: Simplify and align model checks

swh/model/tests/test_model.py

@@ -66,26 +66,18 @@ def test_directory_model_id_computation():
     dir_dict = dict(directory_example)
     del dir_dict['id']
 
-    dir_model = Directory(**dir_dict)
-    assert dir_model.id
-    assert dir_model.id == hash_to_bytes(directory_identifier(dir_dict))
-
-    dir_model = Directory.from_dict(dir_dict)
-    assert dir_model.id
-    assert dir_model.id == hash_to_bytes(directory_identifier(dir_dict))
+    dir_id = hash_to_bytes(directory_identifier(dir_dict))
+    for dir_model in [Directory(**dir_dict), Directory.from_dict(dir_dict)]:
+        assert dir_model.id == dir_id
 
 
 def test_revision_model_id_computation():
     rev_dict = dict(revision_example)
     del rev_dict['id']
 
-    rev_model = Revision(**rev_dict)
-    assert rev_model.id
-    assert rev_model.id == hash_to_bytes(revision_identifier(rev_dict))
-
-    rev_model = Revision.from_dict(rev_dict)
-    assert rev_model.id
-    assert rev_model.id == hash_to_bytes(revision_identifier(rev_dict))
+    rev_id = hash_to_bytes(revision_identifier(rev_dict))
+    for rev_model in [Revision(**rev_dict), Revision.from_dict(rev_dict)]:
+        assert rev_model.id == rev_id
 
 
 def test_revision_model_id_computation_with_no_date():
@@ -108,23 +100,15 @@ def test_release_model_id_computation():
     rel_dict = dict(release_example)
     del rel_dict['id']
 
-    rel_model = Release(**rel_dict)
-    assert rel_model.id
-    assert rel_model.id == hash_to_bytes(release_identifier(rel_dict))
-
-    rel_model = Release.from_dict(rel_dict)
-    assert rel_model.id
-    assert rel_model.id == hash_to_bytes(release_identifier(rel_dict))
+    rel_id = hash_to_bytes(release_identifier(rel_dict))
+    for rel_model in [Release(**rel_dict), Release.from_dict(rel_dict)]:
+        assert rel_model.id == hash_to_bytes(rel_id)
 
 
 def test_snapshot_model_id_computation():
     snp_dict = dict(snapshot_example)
     del snp_dict['id']
 
-    snp_model = Snapshot(**snp_dict)
-    assert snp_model.id
-    assert snp_model.id == hash_to_bytes(snapshot_identifier(snp_dict))
-
-    snp_model = Snapshot.from_dict(snp_dict)
-    assert snp_model.id
-    assert snp_model.id == hash_to_bytes(snapshot_identifier(snp_dict))
+    snp_id = hash_to_bytes(snapshot_identifier(snp_dict))
+    for snp_model in [Snapshot(**snp_dict), Snapshot.from_dict(snp_dict)]:
+        assert snp_model.id == snp_id