Revize 6e32cf7d

Re #8578 - Extended tests after review
- added second tree of certificates to better cover

tests/integration_tests/dao/certificate_repository_test.py

@@ -3 +3 @@
 from src.model.certificate import Certificate
 from src.model.private_key import PrivateKey
 
-# type=CA => usage={CA:True}
-
 
 def test_set_certificate_revoked(certificate_repository, private_key_repository):
     private_key = PrivateKey(private_key_id=-1, private_key="test_pk", password="test_password")
@@ -116 +114 @@
     certificate_repository.set_certificate_revoked(
         certificate_id=child_3_id, revocation_date="test_revoke_child_3", revocation_reason="test_parent")
 
+    sec_tree_certificate = Certificate(certificate_id=-1, common_name="test_sec_tree", valid_from="test_from",
+                                       valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
+                                       type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    sec_tree_certificate_id = certificate_repository.create(certificate=sec_tree_certificate)
+
+    assert type(sec_tree_certificate_id) is int
+
+    sec_tree_certificate.type_id = INTERMEDIATE_CA_ID
+    sec_tree_certificate.parent_id = sec_tree_certificate_id
+
+    sec_tree_certificate.common_name = "sec_tree_child_1"
+    sec_tree_child_1 = certificate_repository.create(certificate=sec_tree_certificate)
+
+    sec_tree_certificate.common_name = "sec_tree_child_2"
+    sec_tree_child_2 = certificate_repository.create(certificate=sec_tree_certificate)
+
+    certificate_repository.set_certificate_revoked(
+        certificate_id=sec_tree_child_1, revocation_date="test_revoke_child_1", revocation_reason="test_parent")
+
     certificates = certificate_repository.get_all_revoked_by(certificate_id=certificate_id)
 
     assert len(certificates) == 2
@@ -152 +169 @@
     certificate_repository.set_certificate_revoked(
         certificate_id=child_3_id, revocation_date="test_revoke_child_3", revocation_reason="test_parent")
 
+    sec_tree_certificate = Certificate(certificate_id=-1, common_name="test_sec_tree", valid_from="test_from",
+                                       valid_to="test_to", pem_data="test_pem_data", private_key_id=private_key_id,
+                                       type_id=ROOT_CA_ID, parent_id=-1, usages={CA_ID: True})
+    sec_tree_certificate_id = certificate_repository.create(certificate=sec_tree_certificate)
+
+    assert type(sec_tree_certificate_id) is int
+
+    sec_tree_certificate.type_id = INTERMEDIATE_CA_ID
+    sec_tree_certificate.parent_id = sec_tree_certificate_id
+
+    sec_tree_certificate.common_name = "sec_tree_child_1"
+    sec_tree_child_1 = certificate_repository.create(certificate=sec_tree_certificate)
+
+    sec_tree_certificate.common_name = "sec_tree_child_2"
+    sec_tree_child_2 = certificate_repository.create(certificate=sec_tree_certificate)
+
+    certificate_repository.set_certificate_revoked(
+        certificate_id=sec_tree_child_1, revocation_date="test_revoke_child_1", revocation_reason="test_parent")
+
     certificates = certificate_repository.get_all_issued_by(certificate_id=certificate_id)
 
     assert len(certificates) == 3