Merge pull request #808 from tschmidtb51/tlp

TLP - remove obsolete test
oasis-tcs · Oct 25, 2024 · 8ed054c · 8ed054c
2 parents 13237a3 + dd92a3c
commit 8ed054c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 61 deletions.
diff --git a/csaf_2.1/prose/edit/src/tests-02-optional.md b/csaf_2.1/prose/edit/src/tests-02-optional.md
@@ -322,27 +322,10 @@ The relevant paths for this test are:
 
 > The hash algorithm `sha1` is used in one item of hashes without being accompanied by a second hash algorithm.
 
-### Missing TLP label (deprecated){#missing-tlp-label}
+### Missing TLP label (obsolete){#missing-tlp-label}
 
-It MUST be tested that `/document/distribution/tlp/label` is present and valid.
-
-> TLP labels support the machine-readability and automated distribution.
-
-The relevant path for this test is:
-
-```
-  /document/distribution/tlp/label
-```
-
-*Example 1 (which fails the test):*
-
-```
-    "distribution": {
-      "text": "Distribute freely."
-    }
-```
-
-> The CSAF document has no TLP label.
+> The TLP label is now required by the schema. Therefore, the optional test is obsolete.
+> This section is kept to document that change and keep the numbering of the remaining sections stable.
 
 ### Missing Canonical URL
 

diff --git a/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-10-01.json b/csaf_2.1/test/validator/data/optional/oasis_csaf_tc-csaf_2_1-2024-6-2-10-01.json
diff --git a/csaf_2.1/test/validator/data/testcases.json b/csaf_2.1/test/validator/data/testcases.json
@@ -1155,16 +1155,6 @@
         }
       ]
     },
-    {
-      "id": "6.2.10",
-      "group": "optional",
-      "failures": [
-        {
-          "name": "optional/oasis_csaf_tc-csaf_2_1-2024-6-2-10-01.json",
-          "valid": true
-        }
-      ]
-    },
     {
       "id": "6.2.11",
       "group": "optional",

diff --git 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]\\.2[0-6])|(1\\.2[8-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-4]))$"
+          "pattern": "^6\\.(([1-3]\\.[1-9])|(1\\.10)|([12]\\.1[1-9])|(3\\.1[0-2])|([12]\\.2[0-6])|(1\\.2[8-9])|(1\\.27\\.([1-9]|10|11))|(1\\.3[0-4]))$"
         },
         "valid": {
           "title": "List of valid examples",