tests: adapted tests

Author: PascalDR

pymdoccbor/tests/cert_data.py

@@ -0,0 +1,13 @@
+from datetime import datetime, timezone, timedelta
+
+CERT_DATA ={
+    "country_name": "US",
+    "state_or_province_name": "California",
+    "locality_name": "San Francisco",
+    "organization_name": "Micov",
+    "common_name": "My Company",
+    "san_url": "mysite.com",
+    "not_valid_before": datetime.now(timezone.utc) - timedelta(days=1),
+    "not_valid_after": datetime.now(timezone.utc) + timedelta(days=10),
+    "san_url": "https://credential-issuer.example.org"
+}

pymdoccbor/tests/test_02_mdoc_issuer.py

@@ -11,6 +11,9 @@
 from pymdoccbor.mdoc.verifier import MdocCbor
 from pymdoccbor.mso.issuer import MsoIssuer
 from pymdoccbor.tests.pid_data import PID_DATA
+from pymdoccbor.tests.cert_data import CERT_DATA
+
+from datetime import datetime, timezone, timedelta
 
 
 PKEY = {
@@ -35,7 +38,8 @@ def test_mso_writer():
         data=PID_DATA,
         private_key=PKEY,
         validity=validity,
-        alg = "ES256"
+        alg = "ES256",
+        cert_info=CERT_DATA
     )
 
     assert "eu.europa.ec.eudiw.pid.1" in msoi.hash_map
@@ -57,7 +61,8 @@ def test_mdoc_issuer():
     validity = {"issuance_date": "2025-01-17", "expiry_date": "2025-11-13" }
     mdoci = MdocCborIssuer(
         private_key=PKEY,
-        alg = "ES256"
+        alg = "ES256",
+        cert_info=CERT_DATA
     )
     with open("pymdoccbor/tests/certs/fake-cert.pem", "rb") as file:
         fake_cert_file = file.read()

pymdoccbor/tests/test_03_mdoc_issuer.py

@@ -3,10 +3,12 @@
 from pymdoccbor.tests.micov_data import MICOV_DATA
 from pymdoccbor.tests.pid_data import PID_DATA
 from pymdoccbor.tests.pkey import PKEY
+from pymdoccbor.tests.cert_data import CERT_DATA
 
 mdoc = MdocCborIssuer(
     private_key=PKEY,
     alg="ES256",
+    cert_info=CERT_DATA
 )
 
 def test_MdocCborIssuer_creation():

pymdoccbor/tests/test_04_issuer_signed.py

@@ -3,11 +3,13 @@
 from pymdoccbor.mdoc.issuer import MdocCborIssuer
 from pymdoccbor.tests.micov_data import MICOV_DATA
 from pymdoccbor.tests.pkey import PKEY
+from pymdoccbor.tests.cert_data import CERT_DATA
 
 
 mdoc = MdocCborIssuer(
     private_key=PKEY,
     alg="ES256",
+    cert_info=CERT_DATA
 )
 mdoc.new(
     data=MICOV_DATA,

pymdoccbor/tests/test_05_mdoc_verifier.py

@@ -3,6 +3,7 @@
 from pymdoccbor.mdoc.issuer import MdocCborIssuer
 from pymdoccbor.tests.micov_data import MICOV_DATA
 from pymdoccbor.tests.pkey import PKEY
+from pymdoccbor.tests.cert_data import CERT_DATA
 
 def test_verifier_must_fail_document_type():
     try:
@@ -20,6 +21,7 @@ def test_mobile_document():
     mdoc = MdocCborIssuer(
         private_key=PKEY,
         alg="ES256",
+        cert_info=CERT_DATA
     )
     mdoc.new(
         data=MICOV_DATA,
@@ -41,7 +43,8 @@ def test_mobile_document():
 def test_mobile_document_dump():
     mdoc = MdocCborIssuer(
         private_key=PKEY,
-        alg="ES256"
+        alg="ES256",
+        cert_info=CERT_DATA
     )
     mdoc.new(
         data=MICOV_DATA,
@@ -65,7 +68,8 @@ def test_mobile_document_dump():
 def test_mobile_document_dumps():
     mdoc = MdocCborIssuer(
         private_key=PKEY,
-        alg="ES256"
+        alg="ES256",
+        cert_info=CERT_DATA
     )
     mdoc.new(
         data=MICOV_DATA,
@@ -89,7 +93,8 @@ def test_mobile_document_dumps():
 def test_mobile_document_verify():
     mdoc = MdocCborIssuer(
         private_key=PKEY,
-        alg="ES256"
+        alg="ES256",
+        cert_info=CERT_DATA
     )
     mdoc.new(
         data=MICOV_DATA,

pymdoccbor/tests/test_06_mso_issuer.py

@@ -3,6 +3,7 @@
 from pymdoccbor.mso.issuer import MsoIssuer
 from pymdoccbor.tests.micov_data import MICOV_DATA
 from pymdoccbor.tests.pkey import PKEY
+from pymdoccbor.tests.cert_data import CERT_DATA
 
 
 def test_mso_issuer_fail():
@@ -19,7 +20,8 @@ def test_mso_issuer_creation():
             "issuance_date": "2024-12-31",
             "expiry_date": "2050-12-31"
         },
-        alg="ES256"
+        alg="ES256",
+        cert_info=CERT_DATA
     )
 
     assert msoi.private_key
@@ -36,7 +38,8 @@ def test_mso_issuer_sign():
             "issuance_date": "2024-12-31",
             "expiry_date": "2050-12-31"
         },
-        alg="ES256"
+        alg="ES256",
+        cert_info=CERT_DATA
     )
 
     mso = msoi.sign()

pymdoccbor/tests/test_07_mso_verifier.py

@@ -1,16 +1,16 @@
 
-import os
-from pycose.keys import CoseKey, EC2Key
 from pymdoccbor.mso.verifier import MsoVerifier
 from pymdoccbor.mdoc.issuer import MdocCborIssuer
 from pymdoccbor.tests.micov_data import MICOV_DATA
 from pycose.messages import CoseMessage
 from pymdoccbor.tests.pkey import PKEY
+from pymdoccbor.tests.cert_data import CERT_DATA
 
 
 mdoc = MdocCborIssuer(
     private_key=PKEY,
     alg="ES256",
+    cert_info=CERT_DATA
 )
 
 mdoc.new(

pymdoccbor/tests/test_08_mdoc_cbor.py

@@ -4,11 +4,13 @@
 from pymdoccbor.tests.micov_data import MICOV_DATA
 from pymdoccbor.mdoc.verifier import MdocCbor
 from pymdoccbor.tests.pkey import PKEY
+from pymdoccbor.tests.cert_data import CERT_DATA
 
 def test_mdoc_cbor_creation():
     mdoci = MdocCborIssuer(
         private_key=PKEY,
         alg="ES256",
+        cert_info=CERT_DATA
     )
     mdoc = mdoci.new(
         data=MICOV_DATA,
@@ -46,6 +48,7 @@ def test_mdoc_cbor_invalid_status():
     mdoci = MdocCborIssuer(
         private_key=PKEY,
         alg="ES256",
+        cert_info=CERT_DATA
     )
 
     try: