From 70adeb97c22a8f919f47bd4d5743f04902af1a92 Mon Sep 17 00:00:00 2001 From: tschmidtb51 <65305130+tschmidtb51@users.noreply.github.com> Date: Tue, 28 May 2024 00:04:57 +0200 Subject: [PATCH 1/5] Same Timestamps - resolves oasis-tcs/csaf#627 - add optional test that warns if two timestamps in the revision history are the same - add invalid examples for 6.2.21 - add valid examples for 6.2.21 - update testcase and schema for testcases --- csaf_2.1/prose/edit/src/tests-02-optional.md | 29 ++++++++ ...oasis_csaf_tc-csaf_2_1-2024-6-2-21-01.json | 36 ++++++++++ ...oasis_csaf_tc-csaf_2_1-2024-6-2-21-02.json | 61 +++++++++++++++++ ...oasis_csaf_tc-csaf_2_1-2024-6-2-21-03.json | 66 +++++++++++++++++++ ...oasis_csaf_tc-csaf_2_1-2024-6-2-21-11.json | 36 ++++++++++ ...oasis_csaf_tc-csaf_2_1-2024-6-2-21-12.json | 61 +++++++++++++++++ ...oasis_csaf_tc-csaf_2_1-2024-6-2-21-13.json | 66 +++++++++++++++++++ csaf_2.1/test/validator/data/testcases.json | 33 ++++++++++ .../test/validator/testcases_json_schema.json | 2 +- 9 files changed, 389 insertions(+), 1 deletion(-) create mode 100644 csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-01.json create mode 100644 csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-02.json create mode 100644 csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-03.json create mode 100644 csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-11.json create mode 100644 csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-12.json create mode 100644 csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-13.json diff --git a/csaf_2.1/prose/edit/src/tests-02-optional.md b/csaf_2.1/prose/edit/src/tests-02-optional.md index 08f04089..0d6efe7a 100644 --- a/csaf_2.1/prose/edit/src/tests-02-optional.md +++ b/csaf_2.1/prose/edit/src/tests-02-optional.md @@ -645,3 +645,32 @@ The relevant path for this test is: > The key `custom_property` is not defined in the JSON schema. > A tool MAY remove such keys as a quick fix. + +### Same Timestamps in Revision History + +It MUST be tested that the timestamps of all items in the revision history are pairwise disjoint, when converted to UTC. + +The relevant path for this test is: + +``` + /document/tracking/revision_history[]/date +``` + +*Example 1 (which fails the test):* + +``` + "revision_history": [ + { + "date": "2024-01-21T10:00:00.000Z", + "number": "2.0.0", + "summary": "Second version." + }, + { + "date": "2024-01-21T10:00:00.000Z", + "number": "1.0.0", + "summary": "Initial version." + } + ] +``` + +> The first and second revision have the same timestamp. diff --git a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-01.json b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-01.json new file mode 100644 index 00000000..0b1e5695 --- /dev/null +++ b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-01.json @@ -0,0 +1,36 @@ +{ + "document": { + "category": "csaf_base", + "csaf_version": "2.1", + "distribution": { + "tlp": { + "label": "CLEAR" + } + }, + "publisher": { + "category": "other", + "name": "OASIS CSAF TC", + "namespace": "https://csaf.io" + }, + "title": "Optional test: Same Timestamps in Revision History (failing example 1)", + "tracking": { + "current_release_date": "2024-01-21T10:00:00.000Z", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-2-21-01", + "initial_release_date": "2024-01-21T10:00:00.000Z", + "revision_history": [ + { + "date": "2024-01-21T10:00:00.000Z", + "number": "2.0.0", + "summary": "Second version." + }, + { + "date": "2024-01-21T10:00:00.000Z", + "number": "1.0.0", + "summary": "Initial version." + } + ], + "status": "final", + "version": "2.0.0" + } + } +} diff --git a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-02.json b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-02.json new file mode 100644 index 00000000..1bf56521 --- /dev/null +++ b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-02.json @@ -0,0 +1,61 @@ +{ + "document": { + "category": "csaf_base", + "csaf_version": "2.1", + "distribution": { + "tlp": { + "label": "CLEAR" + } + }, + "publisher": { + "category": "other", + "name": "OASIS CSAF TC", + "namespace": "https://csaf.io" + }, + "title": "Optional test: Same Timestamps in Revision History (failing example 2)", + "tracking": { + "current_release_date": "2024-01-23T13:00:00.000Z", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-2-21-02", + "initial_release_date": "2024-01-21T10:00:00.000Z", + "revision_history": [ + { + "date": "2024-01-21T10:00:00.000Z", + "number": "2", + "summary": "Second version." + }, + { + "date": "2024-01-22T11:00:00.000Z", + "number": "4", + "summary": "Fourth version." + }, + { + "date": "2024-01-23T12:00:00.000Z", + "number": "5", + "summary": "Fifth version." + }, + { + "date": "2024-01-22T11:00:00.000Z", + "number": "3", + "summary": "Third version." + }, + { + "date": "2024-01-21T10:00:00.000Z", + "number": "1", + "summary": "Initial version." + }, + { + "date": "2024-01-22T11:00:00.000Z", + "number": "6", + "summary": "Sixth version." + }, + { + "date": "2024-01-23T13:00:00.000Z", + "number": "7", + "summary": "Seventh version." + } + ], + "status": "final", + "version": "7" + } + } +} diff --git a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-03.json b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-03.json new file mode 100644 index 00000000..426ba590 --- /dev/null +++ b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-03.json @@ -0,0 +1,66 @@ +{ + "document": { + "category": "csaf_base", + "csaf_version": "2.1", + "distribution": { + "tlp": { + "label": "CLEAR" + } + }, + "publisher": { + "category": "other", + "name": "OASIS CSAF TC", + "namespace": "https://csaf.io" + }, + "title": "Optional test: Same Timestamps in Revision History (failing example 3)", + "tracking": { + "current_release_date": "2024-01-21T10:00:00.000Z", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-2-21-03", + "initial_release_date": "2024-01-21T10:00:00.000Z", + "revision_history": [ + { + "date": "2024-01-21T10:00:00.000Z", + "number": "1", + "summary": "Initial version." + }, + { + "date": "2024-01-21T11:00:00.000+01:00", + "number": "2", + "summary": "Second version." + }, + { + "date": "2024-01-21T20:00:00.000+10:00", + "number": "3", + "summary": "Third version." + }, + { + "date": "2024-01-21T05:00:00.000-05:00", + "number": "4", + "summary": "Fourth version." + }, + { + "date": "2024-01-21T13:00:00.000+03:00", + "number": "5", + "summary": "Fifth version." + }, + { + "date": "2024-01-21T07:00:00.000-03:00", + "number": "6", + "summary": "Sixth version." + }, + { + "date": "2024-01-21T00:00:00.000-10:00", + "number": "7", + "summary": "Seventh version." + }, + { + "date": "2024-01-22T00:00:00.000+14:00", + "number": "8", + "summary": "Eighth version." + } + ], + "status": "final", + "version": "8" + } + } +} diff --git a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-11.json b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-11.json new file mode 100644 index 00000000..bb7cd5c5 --- /dev/null +++ b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-11.json @@ -0,0 +1,36 @@ +{ + "document": { + "category": "csaf_base", + "csaf_version": "2.1", + "distribution": { + "tlp": { + "label": "CLEAR" + } + }, + "publisher": { + "category": "other", + "name": "OASIS CSAF TC", + "namespace": "https://csaf.io" + }, + "title": "Optional test: Same Timestamps in Revision History (valid example 1)", + "tracking": { + "current_release_date": "2024-01-21T10:00:00.0001Z", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-2-21-11", + "initial_release_date": "2024-01-21T10:00:00.000Z", + "revision_history": [ + { + "date": "2024-01-21T10:00:00.0001Z", + "number": "2.0.0", + "summary": "Second version." + }, + { + "date": "2024-01-21T10:00:00.000Z", + "number": "1.0.0", + "summary": "Initial version." + } + ], + "status": "final", + "version": "2.0.0" + } + } +} diff --git a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-12.json b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-12.json new file mode 100644 index 00000000..e25b97c4 --- /dev/null +++ b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-12.json @@ -0,0 +1,61 @@ +{ + "document": { + "category": "csaf_base", + "csaf_version": "2.1", + "distribution": { + "tlp": { + "label": "CLEAR" + } + }, + "publisher": { + "category": "other", + "name": "OASIS CSAF TC", + "namespace": "https://csaf.io" + }, + "title": "Optional test: Same Timestamps in Revision History (valid example 2)", + "tracking": { + "current_release_date": "2024-01-23T13:55:00.000Z", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-2-21-12", + "initial_release_date": "2024-01-21T10:00:00.000Z", + "revision_history": [ + { + "date": "2024-01-21T10:00:00.0005Z", + "number": "2", + "summary": "Second version." + }, + { + "date": "2024-01-22T12:00:00.000Z", + "number": "4", + "summary": "Fourth version." + }, + { + "date": "2024-01-23T12:00:00.000Z", + "number": "5", + "summary": "Fifth version." + }, + { + "date": "2024-01-22T11:00:00.000Z", + "number": "3", + "summary": "Third version." + }, + { + "date": "2024-01-21T10:00:00.0002Z", + "number": "1", + "summary": "Initial version." + }, + { + "date": "2024-01-23T13:00:00.000Z", + "number": "6", + "summary": "Sixth version." + }, + { + "date": "2024-01-23T13:55:00.000Z", + "number": "7", + "summary": "Seventh version." + } + ], + "status": "final", + "version": "7" + } + } +} diff --git a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-13.json b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-13.json new file mode 100644 index 00000000..5c28846b --- /dev/null +++ b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-13.json @@ -0,0 +1,66 @@ +{ + "document": { + "category": "csaf_base", + "csaf_version": "2.1", + "distribution": { + "tlp": { + "label": "CLEAR" + } + }, + "publisher": { + "category": "other", + "name": "OASIS CSAF TC", + "namespace": "https://csaf.io" + }, + "title": "Optional test: Same Timestamps in Revision History (failing example 3)", + "tracking": { + "current_release_date": "2024-01-21T10:00:00.000Z", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-2-21-03", + "initial_release_date": "2024-01-21T10:00:00.000Z", + "revision_history": [ + { + "date": "2024-01-21T10:00:00.000Z", + "number": "1", + "summary": "Initial version." + }, + { + "date": "2024-01-21T11:00:00.007+01:00", + "number": "2", + "summary": "Second version." + }, + { + "date": "2024-01-21T20:00:00.060+10:00", + "number": "3", + "summary": "Third version." + }, + { + "date": "2024-01-21T05:00:00.500-05:00", + "number": "4", + "summary": "Fourth version." + }, + { + "date": "2024-01-21T13:00:04.000+03:00", + "number": "5", + "summary": "Fifth version." + }, + { + "date": "2024-01-21T07:00:30.000-03:00", + "number": "6", + "summary": "Sixth version." + }, + { + "date": "2024-01-21T00:02:00.000-10:00", + "number": "7", + "summary": "Seventh version." + }, + { + "date": "2024-01-22T00:10:00.000+14:00", + "number": "8", + "summary": "Eighth version." + } + ], + "status": "final", + "version": "8" + } + } +} diff --git a/csaf_2.1/test/validator/data/testcases.json b/csaf_2.1/test/validator/data/testcases.json index 6924b4b6..ddfa5a06 100644 --- a/csaf_2.1/test/validator/data/testcases.json +++ b/csaf_2.1/test/validator/data/testcases.json @@ -1278,6 +1278,39 @@ } ] }, + , + { + "id": "6.2.21", + "group": "optional", + "failures": [ + { + "name": "optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-01.json", + "valid": true + }, + { + "name": "optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-02.json", + "valid": true + }, + { + "name": "optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-03.json", + "valid": true + } + ], + "valid": [ + { + "name": "optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-11.json", + "valid": true + }, + { + "name": "optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-12.json", + "valid": true + }, + { + "name": "optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-13.json", + "valid": true + } + ] + }, { "id": "6.3.1", "group": "informative", diff --git a/csaf_2.1/test/validator/testcases_json_schema.json b/csaf_2.1/test/validator/testcases_json_schema.json index 24b0d510..46bc282a 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])|([12]\\.1[0-9])|(3\\.1[0-2])|([12]\\.20)|(1\\.2[1-68-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-3]))$" + "pattern": "^6\\.(([1-3]\\.[1-9])|([12]\\.1[0-9])|(3\\.1[0-2])|([12]\\.2[0-1])|(1\\.2[2-68-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-3]))$" }, "valid": { "title": "List of valid examples", From a94126c52fc8980b8e6e50e32163717e519d513d Mon Sep 17 00:00:00 2001 From: tschmidtb51 <65305130+tschmidtb51@users.noreply.github.com> Date: Tue, 28 May 2024 00:25:44 +0200 Subject: [PATCH 2/5] Same Timestamps - addresses parts of oasis-tcs/csaf#744 - correct metadata of valid example 3 of 6.2.21 - unify metadata of invalid example 3 of 6.2.21 - fix invalid JSON --- .../optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-03.json | 2 +- .../optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-13.json | 6 +++--- csaf_2.1/test/validator/data/testcases.json | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-03.json b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-03.json index 426ba590..288a686b 100644 --- a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-03.json +++ b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-03.json @@ -14,7 +14,7 @@ }, "title": "Optional test: Same Timestamps in Revision History (failing example 3)", "tracking": { - "current_release_date": "2024-01-21T10:00:00.000Z", + "current_release_date": "2024-01-22T00:00:00.000+14:00", "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-2-21-03", "initial_release_date": "2024-01-21T10:00:00.000Z", "revision_history": [ diff --git a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-13.json b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-13.json index 5c28846b..8299b423 100644 --- a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-13.json +++ b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-13.json @@ -12,10 +12,10 @@ "name": "OASIS CSAF TC", "namespace": "https://csaf.io" }, - "title": "Optional test: Same Timestamps in Revision History (failing example 3)", + "title": "Optional test: Same Timestamps in Revision History (valid example 3)", "tracking": { - "current_release_date": "2024-01-21T10:00:00.000Z", - "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-2-21-03", + "current_release_date": "2024-01-22T00:10:00.000+14:00", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-2-21-13", "initial_release_date": "2024-01-21T10: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 ddfa5a06..aa931142 100644 --- a/csaf_2.1/test/validator/data/testcases.json +++ b/csaf_2.1/test/validator/data/testcases.json @@ -1278,7 +1278,6 @@ } ] }, - , { "id": "6.2.21", "group": "optional", From 4e2264b2bbd3b1877e2e964b5d3667a9fee2fa98 Mon Sep 17 00:00:00 2001 From: tschmidtb51 <65305130+tschmidtb51@users.noreply.github.com> Date: Fri, 31 May 2024 11:12:10 +0200 Subject: [PATCH 3/5] Same Timestamps - addresses review comment from oasis-tcs/csaf#744 - state clearly that conversion needs to happen first --- csaf_2.1/prose/edit/src/tests-02-optional.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/csaf_2.1/prose/edit/src/tests-02-optional.md b/csaf_2.1/prose/edit/src/tests-02-optional.md index 0d6efe7a..30c6bf71 100644 --- a/csaf_2.1/prose/edit/src/tests-02-optional.md +++ b/csaf_2.1/prose/edit/src/tests-02-optional.md @@ -648,7 +648,8 @@ The relevant path for this test is: ### Same Timestamps in Revision History -It MUST be tested that the timestamps of all items in the revision history are pairwise disjoint, when converted to UTC. +It MUST be tested that the timestamps of all items in the revision history are pairwise disjoint. +To ensure the correct result, the timestamps SHALL be converted to UTC before checking their uniqueness. The relevant path for this test is: From f0d17e9dda3b2a92eec60793752c9861dd0dc5e7 Mon Sep 17 00:00:00 2001 From: tschmidtb51 <65305130+tschmidtb51@users.noreply.github.com> Date: Fri, 31 May 2024 11:18:08 +0200 Subject: [PATCH 4/5] Same Timestamps - addresses parts of oasis-tcs/csaf#627 - add invalid examples for 6.2.21 --- ...oasis_csaf_tc-csaf_2_1-2024-6-2-21-04.json | 36 +++++++++++++++++++ ...oasis_csaf_tc-csaf_2_1-2024-6-2-21-05.json | 36 +++++++++++++++++++ csaf_2.1/test/validator/data/testcases.json | 8 +++++ 3 files changed, 80 insertions(+) create mode 100644 csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-04.json create mode 100644 csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-05.json diff --git a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-04.json b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-04.json new file mode 100644 index 00000000..9f278359 --- /dev/null +++ b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-04.json @@ -0,0 +1,36 @@ +{ + "document": { + "category": "csaf_base", + "csaf_version": "2.1", + "distribution": { + "tlp": { + "label": "CLEAR" + } + }, + "publisher": { + "category": "other", + "name": "OASIS CSAF TC", + "namespace": "https://csaf.io" + }, + "title": "Optional test: Same Timestamps in Revision History (failing example 4)", + "tracking": { + "current_release_date": "2024-01-21T10:00:00.000Z", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-2-21-04", + "initial_release_date": "2024-01-21T10:00:00.000Z", + "revision_history": [ + { + "date": "2024-01-21T10:00:00.000000Z", + "number": "2.0.0", + "summary": "Second version." + }, + { + "date": "2024-01-21T10:00:00.000Z", + "number": "1.0.0", + "summary": "Initial version." + } + ], + "status": "final", + "version": "2.0.0" + } + } +} diff --git a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-05.json b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-05.json new file mode 100644 index 00000000..3e497d19 --- /dev/null +++ b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-05.json @@ -0,0 +1,36 @@ +{ + "document": { + "category": "csaf_base", + "csaf_version": "2.1", + "distribution": { + "tlp": { + "label": "CLEAR" + } + }, + "publisher": { + "category": "other", + "name": "OASIS CSAF TC", + "namespace": "https://csaf.io" + }, + "title": "Optional test: Same Timestamps in Revision History (failing example 5)", + "tracking": { + "current_release_date": "2024-01-21T10:00:00.000Z", + "id": "OASIS_CSAF_TC-CSAF_2.1-2024-6-2-21-05", + "initial_release_date": "2024-01-21T10:00:00.000Z", + "revision_history": [ + { + "date": "2024-01-21T10:00:00.000+00:00", + "number": "2.0.0", + "summary": "Second version." + }, + { + "date": "2024-01-21T10:00:00.000Z", + "number": "1.0.0", + "summary": "Initial version." + } + ], + "status": "final", + "version": "2.0.0" + } + } +} diff --git a/csaf_2.1/test/validator/data/testcases.json b/csaf_2.1/test/validator/data/testcases.json index aa931142..4ac2d3a1 100644 --- a/csaf_2.1/test/validator/data/testcases.json +++ b/csaf_2.1/test/validator/data/testcases.json @@ -1293,6 +1293,14 @@ { "name": "optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-03.json", "valid": true + }, + { + "name": "optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-04.json", + "valid": true + }, + { + "name": "optional/oasis_csaf_tc-csaf_2_1-2024-6-2-21-05.json", + "valid": true } ], "valid": [ From ab3c9b205aa88a3155bc85e0d6f74f0ce4209640 Mon Sep 17 00:00:00 2001 From: tschmidtb51 <65305130+tschmidtb51@users.noreply.github.com> Date: Fri, 31 May 2024 21:41:17 +0200 Subject: [PATCH 5/5] Same Timestamps - addresses review comment from oasis-tcs/csaf#744 - simplify requirement on comparison --- csaf_2.1/prose/edit/src/tests-02-optional.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csaf_2.1/prose/edit/src/tests-02-optional.md b/csaf_2.1/prose/edit/src/tests-02-optional.md index 30c6bf71..e4d1e68b 100644 --- a/csaf_2.1/prose/edit/src/tests-02-optional.md +++ b/csaf_2.1/prose/edit/src/tests-02-optional.md @@ -649,7 +649,7 @@ The relevant path for this test is: ### Same Timestamps in Revision History It MUST be tested that the timestamps of all items in the revision history are pairwise disjoint. -To ensure the correct result, the timestamps SHALL be converted to UTC before checking their uniqueness. +As the timestamps might use different timezones, the comparison MUST take timezones into account. The relevant path for this test is: