tests: adapted tests

Author: PascalDR

pymdoccbor/tests/micov_data.py

@@ -0,0 +1,23 @@
+MICOV_DATA = {
+    "org.micov.medical.1":{
+        "last_name": "Rossi",
+        "given_name": "Mario",
+        "birth_date": "1922-03-13",
+        "PersonId_nic": {
+            "PersonIdNumber": "1234567890",
+            "PersonIdType": "nic",
+            "PersonIdIS": "IT",
+        },
+        "sex": 1,
+        "VPInfo_COVID-19_1": {
+            "VaccineProphylaxis": "",
+            "VaccMedicinalProd": "Moderna",
+            "VaccMktAuthHolder": "Moderna",
+            "VaccDoseNumber": "2/2",
+            "VaccAdmDate": "2021-01-01",
+            "VaccCountry": "IT",
+        },
+        "CertIssuer": "Italian Ministry of Health",
+        "CertId": "1234567890",
+    }
+}

pymdoccbor/tests/test_02_mdoc_issuer.py

@@ -1,6 +1,5 @@
 import cbor2
 import os
-
 from pycose.messages import Sign1Message
 
 from pymdoccbor.mdoc.issuer import MdocCborIssuer
@@ -21,10 +20,20 @@
 def test_mso_writer():
     msoi = MsoIssuer(
         data=PID_DATA,
-        private_key=PKEY
+        private_key=PKEY,
+        validity={
+            "issuance_date": "2024-12-31",
+            "expiry_date": "2050-12-31"
+        },
+        alg="ES256"
     )
 
-    # TODO: assertion here about msow.hash_map and msow.disclosure_map
+    assert "eu.europa.ec.eudiw.pid.1" in msoi.hash_map
+    assert msoi.hash_map["eu.europa.ec.eudiw.pid.1"]
+
+    assert "eu.europa.ec.eudiw.pid.1" in msoi.disclosure_map
+    assert msoi.disclosure_map["eu.europa.ec.eudiw.pid.1"]
+    assert msoi.disclosure_map["eu.europa.ec.eudiw.pid.1"].values().__len__() == PID_DATA["eu.europa.ec.eudiw.pid.1"].values().__len__()
 
     mso = msoi.sign()
 
@@ -36,13 +45,18 @@ def test_mso_writer():
 
 def test_mdoc_issuer():
     mdoci = MdocCborIssuer(
-        private_key=PKEY
+        private_key=PKEY,
+        alg="ES256",
     )
 
     mdoc = mdoci.new(
         doctype="eu.europa.ec.eudiw.pid.1",
         data=PID_DATA,
-        devicekeyinfo=PKEY  # TODO
+        #devicekeyinfo=PKEY,  TODO
+        validity={
+            "issuance_date": "2024-12-31",
+            "expiry_date": "2050-12-31"
+        },
     )
 
     mdocp = MdocCbor()

pymdoccbor/tests/test_08_mdoc_cbor.py

@@ -0,0 +1,36 @@
+import os
+import cbor2
+from pymdoccbor.mdoc.issuer import MdocCborIssuer
+from pymdoccbor.tests.micov_data import MICOV_DATA
+from pymdoccbor.mdoc.verifier import MdocCbor
+
+PKEY = {
+    'KTY': 'EC2',
+    'CURVE': 'P_256',
+    'ALG': 'ES256',
+    'D': os.urandom(32),
+    'KID': b"demo-kid"
+}
+
+def test_mdoc_cbor_creation():
+    mdoci = MdocCborIssuer(
+        private_key=PKEY,
+        alg="ES256",
+    )
+    mdoc = mdoci.new(
+        data=MICOV_DATA,
+        #devicekeyinfo=PKEY,  # TODO
+        doctype="org.micov.medical.1",
+        validity={
+            "issuance_date": "2024-12-31",
+            "expiry_date": "2050-12-31"
+        },
+    )
+
+    data = cbor2.dumps(mdoc)  
+
+    mdocp = MdocCbor()
+    mdocp.loads(data)
+    mdocp.verify()
+
+    assert mdoc