From 79aa1a10533e1f55a45e4b8631459f9d84cd95e8 Mon Sep 17 00:00:00 2001 From: tschmidtb51 <65305130+tschmidtb51@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:26:55 +0100 Subject: [PATCH 1/4] Editor Revision 2024-11-27 - addresses parts of oasis-tcs/csaf#705, oasis-tcs/csaf#839 - rename test 6.1.39 to 6.1.38 to reflect structural change --- ...asis_csaf_tc-csaf_2_1-2024-6-1-38-01.json} | 2 +- ...asis_csaf_tc-csaf_2_1-2024-6-1-38-02.json} | 2 +- ...asis_csaf_tc-csaf_2_1-2024-6-1-38-03.json} | 2 +- ...asis_csaf_tc-csaf_2_1-2024-6-1-38-04.json} | 2 +- ...asis_csaf_tc-csaf_2_1-2024-6-1-38-11.json} | 2 +- ...asis_csaf_tc-csaf_2_1-2024-6-1-38-12.json} | 2 +- ...asis_csaf_tc-csaf_2_1-2024-6-1-38-13.json} | 2 +- ...asis_csaf_tc-csaf_2_1-2024-6-1-38-14.json} | 2 +- ...asis_csaf_tc-csaf_2_1-2024-6-1-38-15.json} | 2 +- csaf_2.1/test/validator/data/testcases.json | 20 +++++++++---------- .../test/validator/testcases_json_schema.json | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json => oasis_csaf_tc-csaf_2_1-2024-6-1-38-01.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json => oasis_csaf_tc-csaf_2_1-2024-6-1-38-02.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-39-03.json => oasis_csaf_tc-csaf_2_1-2024-6-1-38-03.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-39-04.json => oasis_csaf_tc-csaf_2_1-2024-6-1-38-04.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json => oasis_csaf_tc-csaf_2_1-2024-6-1-38-11.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json => oasis_csaf_tc-csaf_2_1-2024-6-1-38-12.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-39-13.json => oasis_csaf_tc-csaf_2_1-2024-6-1-38-13.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-39-14.json => oasis_csaf_tc-csaf_2_1-2024-6-1-38-14.json} (93%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-39-15.json => oasis_csaf_tc-csaf_2_1-2024-6-1-38-15.json} (94%) diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-01.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-01.json index 771130e98..a6a78c90c 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-01.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (failing example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-01", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-01", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-02.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-02.json index a717d6036..b653debce 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-02.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (failing example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-02", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-02", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-03.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-03.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-03.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-03.json index fdc9774b0..56bf95437 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-03.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-03.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (failing example 3)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-03", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-03", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-04.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-04.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-04.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-04.json index 0fda4fdf2..f2151ea1e 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-04.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-04.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (failing example 4)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-04", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-04", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-11.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-11.json index 0a621afeb..b3e21ee22 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-11.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (valid example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-11", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-11", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-12.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-12.json index a88c2c2d2..3afcd47bd 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-12.json @@ -19,7 +19,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (valid example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-12", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-12", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-13.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-13.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-13.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-13.json index 5de4604d1..0f020c83c 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-13.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-13.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (valid example 3)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-13", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-13", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-14.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-14.json similarity index 93% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-14.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-14.json index 3dad85df9..bd4f3b1d6 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-14.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-14.json @@ -16,7 +16,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (valid example 4)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-14", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-14", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-15.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-15.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-15.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-15.json index 074d3c37f..47a979198 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-15.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-15.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Non-Public Sharing Group with Max UUID (valid example 5)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-15", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-38-15", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/testcases.json b/csaf_2.1/test/validator/data/testcases.json index 77bd0e40a..abd270eae 100644 --- a/csaf_2.1/test/validator/data/testcases.json +++ b/csaf_2.1/test/validator/data/testcases.json @@ -1117,45 +1117,45 @@ ] }, { - "id": "6.1.39", + "id": "6.1.38", "group": "mandatory", "failures": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-01.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-02.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-03.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-03.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-04.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-04.json", "valid": false } ], "valid": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-11.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-12.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-13.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-13.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-14.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-14.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-15.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-38-15.json", "valid": true } ] diff --git a/csaf_2.1/test/validator/testcases_json_schema.json b/csaf_2.1/test/validator/testcases_json_schema.json index c6fbb97f9..b3688e169 100644 --- a/csaf_2.1/test/validator/testcases_json_schema.json +++ b/csaf_2.1/test/validator/testcases_json_schema.json @@ -62,7 +62,7 @@ "title": "Number of the test", "description": "Contains the section number of the test in the specification.", "type": "string", - "pattern": "^6\\.(([1-3]\\.[1-9])|(1\\.10)|([12]\\.1[1-9])|(3\\.1[0-2])|([12]\\.2[0-6])|(2\\.27)|([12]\\.2[8-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-79])|(2\\.30)|(1\\.4[0-2]))$" + "pattern": "^6\\.(([1-3]\\.[1-9])|(1\\.10)|([12]\\.1[1-9])|(3\\.1[0-2])|([12]\\.2[0-6])|(2\\.27)|([12]\\.2[8-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-8])|(2\\.30)|(1\\.4[0-2]))$" }, "valid": { "title": "List of valid examples", From d8c9ddc0511fefe2812c54ebac6fe93d9c19cc70 Mon Sep 17 00:00:00 2001 From: tschmidtb51 <65305130+tschmidtb51@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:32:08 +0100 Subject: [PATCH 2/4] Editor Revision 2024-11-27 - addresses parts of oasis-tcs/csaf#705, oasis-tcs/csaf#839 - rename test 6.1.40 to 6.1.39 to reflect structural change --- ...json => oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json} | 2 +- ...json => oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json} | 2 +- ...json => oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json} | 2 +- ...json => oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json} | 2 +- csaf_2.1/test/validator/data/testcases.json | 10 +++++----- csaf_2.1/test/validator/testcases_json_schema.json | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json => oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json => oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json => oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json => oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json} (94%) diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json index 2c880de0c..d43907285 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json @@ -19,7 +19,7 @@ "title": "Mandatory test: Public Sharing Group with no Max UUID (failing example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-01", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-01", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json index 927dc5c19..7c10469cd 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Public Sharing Group with no Max UUID (failing example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-02", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-02", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json index 3a0e71eaa..65766abd9 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Public Sharing Group with no Max UUID (valid example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-11", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-11", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json index 8efdd4695..db1f73d59 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Public Sharing Group with no Max UUID (valid example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-12", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-39-12", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/testcases.json b/csaf_2.1/test/validator/data/testcases.json index abd270eae..2f69ed5e9 100644 --- a/csaf_2.1/test/validator/data/testcases.json +++ b/csaf_2.1/test/validator/data/testcases.json @@ -1161,25 +1161,25 @@ ] }, { - "id": "6.1.40", + "id": "6.1.39", "group": "mandatory", "failures": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-01.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-02.json", "valid": false } ], "valid": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-11.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-39-12.json", "valid": true } ] diff --git a/csaf_2.1/test/validator/testcases_json_schema.json b/csaf_2.1/test/validator/testcases_json_schema.json index b3688e169..1a234880f 100644 --- a/csaf_2.1/test/validator/testcases_json_schema.json +++ b/csaf_2.1/test/validator/testcases_json_schema.json @@ -62,7 +62,7 @@ "title": "Number of the test", "description": "Contains the section number of the test in the specification.", "type": "string", - "pattern": "^6\\.(([1-3]\\.[1-9])|(1\\.10)|([12]\\.1[1-9])|(3\\.1[0-2])|([12]\\.2[0-6])|(2\\.27)|([12]\\.2[8-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-8])|(2\\.30)|(1\\.4[0-2]))$" + "pattern": "^6\\.(([1-3]\\.[1-9])|(1\\.10)|([12]\\.1[1-9])|(3\\.1[0-2])|([12]\\.2[0-6])|(2\\.27)|([12]\\.2[8-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-9])|(2\\.30)|(1\\.4[1-2]))$" }, "valid": { "title": "List of valid examples", From 00e5c05c61b4f3bb94d2fb399930883839e09a97 Mon Sep 17 00:00:00 2001 From: tschmidtb51 <65305130+tschmidtb51@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:37:28 +0100 Subject: [PATCH 3/4] Editor Revision 2024-11-27 - addresses parts of oasis-tcs/csaf#705, oasis-tcs/csaf#839 - rename test 6.1.41 to 6.1.40 to reflect structural change --- ... => oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json} | 2 +- ... => oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json} | 2 +- ... => oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json} | 2 +- ... => oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json} | 2 +- ... => oasis_csaf_tc-csaf_2_1-2024-6-1-40-13.json} | 2 +- ... => oasis_csaf_tc-csaf_2_1-2024-6-1-40-14.json} | 2 +- csaf_2.1/test/validator/data/testcases.json | 14 +++++++------- csaf_2.1/test/validator/testcases_json_schema.json | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json => oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json => oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json => oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json => oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-41-13.json => oasis_csaf_tc-csaf_2_1-2024-6-1-40-13.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-41-14.json => oasis_csaf_tc-csaf_2_1-2024-6-1-40-14.json} (94%) diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json index 6bddafe9e..eba1bc0b3 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Invalid Sharing Group Name (failing example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-01", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-01", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json index d4b9cc245..e96a3e9be 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Invalid Sharing Group Name (failing example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-02", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-02", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json index 29ef03c04..6f1416409 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Invalid Sharing Group Name (valid example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-11", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-11", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json index 3773793ad..d6dab838c 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Invalid Sharing Group Name (valid example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-12", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-12", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-13.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-13.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-13.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-13.json index 4cd124091..576878cca 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-13.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-13.json @@ -19,7 +19,7 @@ "title": "Mandatory test: Invalid Sharing Group Name (valid example 3)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-13", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-13", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-14.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-14.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-14.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-14.json index b2384c54f..6ac651a65 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-14.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-14.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Invalid Sharing Group Name (valid example 4)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-14", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-40-14", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/testcases.json b/csaf_2.1/test/validator/data/testcases.json index 2f69ed5e9..05fde2bc1 100644 --- a/csaf_2.1/test/validator/data/testcases.json +++ b/csaf_2.1/test/validator/data/testcases.json @@ -1185,33 +1185,33 @@ ] }, { - "id": "6.1.41", + "id": "6.1.40", "group": "mandatory", "failures": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-01.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-02.json", "valid": false } ], "valid": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-11.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-12.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-13.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-13.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-14.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-40-14.json", "valid": true } ] diff --git a/csaf_2.1/test/validator/testcases_json_schema.json b/csaf_2.1/test/validator/testcases_json_schema.json index 1a234880f..1a9ff3e6a 100644 --- a/csaf_2.1/test/validator/testcases_json_schema.json +++ b/csaf_2.1/test/validator/testcases_json_schema.json @@ -62,7 +62,7 @@ "title": "Number of the test", "description": "Contains the section number of the test in the specification.", "type": "string", - "pattern": "^6\\.(([1-3]\\.[1-9])|(1\\.10)|([12]\\.1[1-9])|(3\\.1[0-2])|([12]\\.2[0-6])|(2\\.27)|([12]\\.2[8-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-9])|(2\\.30)|(1\\.4[1-2]))$" + "pattern": "^6\\.(([1-3]\\.[1-9])|(1\\.10)|([12]\\.1[1-9])|(3\\.1[0-2])|([12]\\.2[0-6])|(2\\.27)|([12]\\.2[8-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-9])|(2\\.30)|(1\\.4[02]))$" }, "valid": { "title": "List of valid examples", From 252e44cc5284ed1cf3c5634842ad313dab184dd9 Mon Sep 17 00:00:00 2001 From: tschmidtb51 <65305130+tschmidtb51@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:41:10 +0100 Subject: [PATCH 4/4] Editor Revision 2024-11-27 - addresses parts of oasis-tcs/csaf#705, oasis-tcs/csaf#839 - rename test 6.1.42 to 6.1.41 to reflect structural change --- ... => oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json} | 2 +- ... => oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json} | 2 +- ... => oasis_csaf_tc-csaf_2_1-2024-6-1-41-03.json} | 2 +- ... => oasis_csaf_tc-csaf_2_1-2024-6-1-41-04.json} | 2 +- ... => oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json} | 2 +- ... => oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json} | 2 +- csaf_2.1/test/validator/data/testcases.json | 14 +++++++------- csaf_2.1/test/validator/testcases_json_schema.json | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-42-01.json => oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-42-02.json => oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-42-03.json => oasis_csaf_tc-csaf_2_1-2024-6-1-41-03.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-42-04.json => oasis_csaf_tc-csaf_2_1-2024-6-1-41-04.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-42-11.json => oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json} (94%) rename csaf_2.1/test/validator/data/mandatory/{oasis_csaf_tc-csaf_2_1-2024-6-1-42-12.json => oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json} (94%) diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-01.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-01.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json index 8a74b252a..49ea1473e 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-01.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json @@ -19,7 +19,7 @@ "title": "Mandatory test: Missing Sharing Group Name (failing example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-42-01", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-01", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-02.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-02.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json index d693fe4b6..0c50385cb 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-02.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json @@ -19,7 +19,7 @@ "title": "Mandatory test: Missing Sharing Group Name (failing example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-42-02", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-02", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-03.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-03.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-03.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-03.json index b984b526a..f684e10d7 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-03.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-03.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Missing Sharing Group Name (failing example 3)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-42-03", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-03", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-04.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-04.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-04.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-04.json index 8967cac76..6699e8e73 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-04.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-04.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Missing Sharing Group Name (failing example 4)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-42-04", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-04", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-11.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-11.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json index c4fdec312..27aa1691f 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-11.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Missing Sharing Group Name (valid example 1)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-42-11", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-11", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-12.json b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json similarity index 94% rename from csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-12.json rename to csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json index fc5929109..5bddd0442 100644 --- a/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-12.json +++ b/csaf_2.1/test/validator/data/mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json @@ -20,7 +20,7 @@ "title": "Mandatory test: Missing Sharing Group Name (valid example 2)", "tracking": { "current_release_date": "2024-01-24T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-42-12", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-1-41-12", "initial_release_date": "2024-01-24T10:00:00.000Z", "revision_history": [ { diff --git a/csaf_2.1/test/validator/data/testcases.json b/csaf_2.1/test/validator/data/testcases.json index 05fde2bc1..11d861926 100644 --- a/csaf_2.1/test/validator/data/testcases.json +++ b/csaf_2.1/test/validator/data/testcases.json @@ -1217,33 +1217,33 @@ ] }, { - "id": "6.1.42", + "id": "6.1.41", "group": "mandatory", "failures": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-01.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-01.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-02.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-02.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-03.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-03.json", "valid": false }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-04.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-04.json", "valid": false } ], "valid": [ { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-11.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-11.json", "valid": true }, { - "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-42-12.json", + "name": "mandatory/oasis_csaf_tc-csaf_2_1-2024-6-1-41-12.json", "valid": true } ] diff --git a/csaf_2.1/test/validator/testcases_json_schema.json b/csaf_2.1/test/validator/testcases_json_schema.json index 1a9ff3e6a..c7a0b3f66 100644 --- a/csaf_2.1/test/validator/testcases_json_schema.json +++ b/csaf_2.1/test/validator/testcases_json_schema.json @@ -62,7 +62,7 @@ "title": "Number of the test", "description": "Contains the section number of the test in the specification.", "type": "string", - "pattern": "^6\\.(([1-3]\\.[1-9])|(1\\.10)|([12]\\.1[1-9])|(3\\.1[0-2])|([12]\\.2[0-6])|(2\\.27)|([12]\\.2[8-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-9])|(2\\.30)|(1\\.4[02]))$" + "pattern": "^6\\.(([1-3]\\.[1-9])|(1\\.10)|([12]\\.1[1-9])|(3\\.1[0-2])|([12]\\.2[0-6])|(2\\.27)|([12]\\.2[8-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-9])|(2\\.30)|(1\\.4[0-1]))$" }, "valid": { "title": "List of valid examples",