Commit bd666cdb authored by filatov's avatar filatov
Browse files

1. put ITS_AID verification at the very beginning of profile TCs

2. Check generation time over all possible time validity restriction forms
3. Clean up TPs removing {}
fix #0007298 
parent cc3f8f95
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@
            "key": "_name",
            "origin": "5b25108e-db13-477f-a863-df4a1803cf12",
            "type": "STRING",
            "value": "11. Check secured CAM its_aid value"
            "value": "01. Check secured CAM its_aid value"
        },
        "_transferStatus": {
            "isGenerated": false,
+2 −2
Original line number Diff line number Diff line
@@ -12,14 +12,14 @@
            "key": "_description",
            "origin": "c35481fb-48c3-498b-a6bd-070de03c1527",
            "type": "STRING",
            "value": "Check that the sent Secured CAM contains exactly one HeaderField its_aid that is set to 'AID_CAM'"
            "value": "Check that the sent Secured CAM contains a HeaderField its_aid that is set to 'AID_CAM'"
        },
        "_expectedResults": {
            "isGenerated": false,
            "key": "_expectedResults",
            "origin": "c35481fb-48c3-498b-a6bd-070de03c1527",
            "type": "STRING",
            "value": "with {\r\n\tthe IUT being in the 'authorized' state\r\n}\r\nensure that {\r\n\twhen {\r\n\t\tthe IUT is requested to send CAM\r\n\t} then {\r\n\t\tthe IUT sends a SecuredMessage {\r\n\t\t\tcontaining header_fields ['its_aid'] {\r\n\t\t\t\tcontaining its_aid\r\n\t\t\t\t\tindicating 'AID_CAM'\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}"
            "value": "with {\r\n\tthe IUT being in the 'authorized' state\r\n}\r\nensure that {\r\n\twhen {\r\n\t\tthe IUT is requested to send CAM\r\n\t} then {\r\n\t\tthe IUT sends a SecuredMessage\r\n\t\t\tcontaining header_fields ['its_aid']\r\n\t\t\t\tcontaining its_aid\r\n\t\t\t\t\tindicating 'AID_CAM'\r\n\t}\r\n}"
        },
        "_status": {
            "isGenerated": false,
+2 −2
Original line number Diff line number Diff line
@@ -12,14 +12,14 @@
            "key": "_description",
            "origin": "0560feba-c21e-43e0-9a01-ac4f859dc936",
            "type": "STRING",
            "value": "Check that the secured CAM contains exactly one element of these header fields: signer_info, generation_time, its_aid;\r\nCheck that the header fields are in the ascending order according to the numbering of the enumeration except of the signer_info, which is encoded first;\r\nCheck that generation_time_standard_deviation, expiration, encryption_parameters, recipient_info are not used"
            "value": "Check that the secured CAM contains exactly one element of these header fields: signer_info, generation_time, its_aid;\r\nCheck that the header fields are in the ascending order according to the numbering of the enumeration except of the signer_info, which"
        },
        "_expectedResults": {
            "isGenerated": false,
            "key": "_expectedResults",
            "origin": "0560feba-c21e-43e0-9a01-ac4f859dc936",
            "type": "STRING",
            "value": "with {\r\n\tthe IUT being in the 'authorized' state\r\n}\r\nensure that {\r\n\twhen {\r\n\t\tthe IUT is requested to send a CAM\r\n\t} then {\r\n\t\tthe IUT sends a SecuredMessage  {\r\n\t\t\tcontaining header_fields[0]\r\n\t\t\t\tcontaining type \r\n\t\t\t\t\tindicating 'signer_info'\r\n\t\t\tand containing header_fields [n].type\r\n\t\t\t\tindicating value < header_fields [n+1].type\r\n\t\t\tand containing header_fields ['generation_time']\r\n\t\t\tand containing header_fields['its_aid']\r\n\t\t\t\tindicating 'AID_CAM'\r\n\t\t\tand not containing header_fields['generation_time_standard_deviation']\r\n\t\t\tand not containing header_fields['expiration']\r\n\t\t\tand not containing header_fields['encryption_parameters']\r\n\t\t\tand not containing header_fields['recipient_info']\r\n\t\t}\r\n\t}\r\n}"
            "value": "with {\r\n\tthe IUT being in the 'authorized' state\r\n}\r\nensure that {\r\n\twhen {\r\n\t\tthe IUT is requested to send a CAM\r\n\t} then {\r\n\t\tthe IUT sends a SecuredMessage\r\n\t\t\tcontaining header_fields[0]\r\n\t\t\t\tcontaining type \r\n\t\t\t\t\tindicating 'signer_info'\r\n\t\t\tand containing header_fields [n].type\r\n\t\t\t\tindicating value < header_fields [n+1].type\r\n\t\t\tand containing header_fields ['generation_time']\r\n\t\t\tand containing header_fields['its_aid']\r\n\t\t\tand not containing header_fields['generation_time_standard_deviation']\r\n\t\t\tand not containing header_fields['expiration']\r\n\t\t\tand not containing header_fields['encryption_parameters']\r\n\t\t\tand not containing header_fields['recipient_info']\r\n\t}\r\n}"
        },
        "_status": {
            "isGenerated": false,
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
            "key": "_expectedResults",
            "origin": "4dd68f02-fece-45b0-b94a-b8a30b057618",
            "type": "STRING",
            "value": "with {\r\n\tthe IUT being in the 'authorized' state\r\n\tand the IUT is configured to send more than one CAM per second\r\n\tand the IUT having sent a CAM\r\n\t\tcontaining header_fields['signer_info'].signer.type\r\n\t\t\tindicating 'certificate'\r\n\t\tcontains header_fields['generation_time']\r\n\t\t\tindicating TIME_LAST\r\n}\r\nensure that {\r\n\twhen {\r\n\t\tthe IUT sends one of the next SecuredMessage\r\n\t\t\tcontaining header_fields['signer_info'] {\r\n\t\t\t\tcontaining signer {\r\n\t\t\t\t\tcontaining type\r\n\t\t\t\t\t\tindicating 'certificate'\r\n\t\t\t\t\tcontaining certificate\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tcontaining header_fields['its_aid']\r\n\t\t\t\tindicating 'AID_CAM'\r\n\t} then {\r\n\t\tthis message\r\n\t\t\tcontains header_fields['generation_time']\r\n\t\t\t\tindicating TIME (TIME >= TIME_LAST + 1sec)\r\n\t}\r\n}"
            "value": "with {\r\n\tthe IUT being in the 'authorized' state\r\n\tand the IUT is configured to send more than one CAM per second\r\n\tand the IUT having sent a CAM\r\n\t\tcontaining header_fields['signer_info'].signer.type\r\n\t\t\tindicating 'certificate'\r\n\t\tand contains header_fields['generation_time']\r\n\t\t\tindicating TIME_LAST\r\n}\r\nensure that {\r\n\twhen {\r\n\t\tthe IUT sends one of the next SecuredMessage\r\n\t\t\tcontaining header_fields['signer_info']\r\n\t\t\t\tcontaining signer\r\n\t\t\t\t\tcontaining type\r\n\t\t\t\t\t\tindicating 'certificate'\r\n\t\t\t\t\tand containing certificate\r\n\t} then {\r\n\t\tthis message\r\n\t\t\tcontains header_fields['generation_time']\r\n\t\t\t\tindicating TIME (TIME >= TIME_LAST + 1sec)\r\n\t}\r\n}"
        },
        "_status": {
            "isGenerated": false,
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
            "key": "_expectedResults",
            "origin": "6aa0a009-3bd6-446d-9a81-f89708cb5710",
            "type": "STRING",
            "value": "with {\r\n\tthe IUT being in the 'authorized' state\r\n\tand the IUT is configured to send more than one CAM per second\r\n\tand the IUT having sent a CAM\r\n\t\tcontaining header_fields['signer_info'].signer.type\r\n\t\t\tindicating 'certificate'\r\n\t\tat TIME_1 \r\n}\r\nensure that {\r\n\twhen {\r\n\t\tthe IUT is requested to send next CAM right after 1 second after the TIME_1\r\n\t} then {\r\n\t\tthe IUT sends a SecuredMessage {\r\n\t\t\tcontaining header_fields['its_aid']\r\n\t\t\t\tindicating 'AID_CAM'\r\n\t\t\tcontaining header_fields ['signer_info'] {\r\n\t\t\t\tcontaining signer {\r\n\t\t\t\t\tcontaining type\r\n\t\t\t\t\t\tindicating 'certificate'\r\n\t\t\t\t\tcontaining certificate\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n}\r\n"
            "value": "with {\r\n\tthe IUT being in the 'authorized' state\r\n\tand the IUT is configured to send more than one CAM per second\r\n\tand the IUT having sent a CAM\r\n\t\tcontaining header_fields['signer_info'].signer.type\r\n\t\t\tindicating 'certificate'\r\n\t\tat TIME_1 \r\n}\r\nensure that {\r\n\twhen {\r\n\t\tthe IUT is requested to send next CAM right after 1 second after the TIME_1\r\n\t} then {\r\n\t\tthe IUT sends a SecuredMessage\r\n\t\t\tcontaining header_fields ['signer_info']\r\n\t\t\t\tcontaining signer\r\n\t\t\t\t\tcontaining type\r\n\t\t\t\t\t\tindicating 'certificate'\r\n\t\t\t\t\tand containing certificate\r\n\t}\r\n}\r\n"
        },
        "_status": {
            "isGenerated": false,
Loading