From 4b0d29fbb2fe16249a328dc2bcc661eaf0eab46c Mon Sep 17 00:00:00 2001
From: Michael Lux <michael.lux@aisec.fraunhofer.de>
Date: Tue, 18 Mar 2025 12:30:23 +0100
Subject: [PATCH 1/2] Fixed loader tests to use CSAF 2.1 schema

---
 csaf-lib/src/csaf/csaf2_1/loader.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/csaf-lib/src/csaf/csaf2_1/loader.rs b/csaf-lib/src/csaf/csaf2_1/loader.rs
index d9d6a39..f81d8ad 100644
--- a/csaf-lib/src/csaf/csaf2_1/loader.rs
+++ b/csaf-lib/src/csaf/csaf2_1/loader.rs
@@ -17,7 +17,7 @@ pub fn load_document(path: &str) -> std::io::Result<CommonSecurityAdvisoryFramew
 
 #[cfg(test)]
 mod tests {
-    use crate::csaf::csaf2_0::schema::{
+    use crate::csaf::csaf2_1::schema::{
         CategoryOfPublisher, CommonSecurityAdvisoryFramework, DocumentLevelMetaData, Publisher,
         Revision, Tracking,
     };
@@ -26,7 +26,7 @@ mod tests {
         let metadata: DocumentLevelMetaData = DocumentLevelMetaData::builder()
             .title("Test")
             .category("csaf_base")
-            .csaf_version("2.0")
+            .csaf_version("2.1")
             .publisher(
                 Publisher::builder()
                     .category(CategoryOfPublisher::Coordinator)

From 0a155bb44fad4609358b8d0b5e98c3ef99b34f17 Mon Sep 17 00:00:00 2001
From: Michael Lux <michael.lux@aisec.fraunhofer.de>
Date: Tue, 18 Mar 2025 12:45:21 +0100
Subject: [PATCH 2/2] Fixed loader tests for CSAF 2.1

---
 csaf-lib/src/csaf/csaf2_1/loader.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/csaf-lib/src/csaf/csaf2_1/loader.rs b/csaf-lib/src/csaf/csaf2_1/loader.rs
index f81d8ad..9071d15 100644
--- a/csaf-lib/src/csaf/csaf2_1/loader.rs
+++ b/csaf-lib/src/csaf/csaf2_1/loader.rs
@@ -17,16 +17,21 @@ pub fn load_document(path: &str) -> std::io::Result<CommonSecurityAdvisoryFramew
 
 #[cfg(test)]
 mod tests {
-    use crate::csaf::csaf2_1::schema::{
-        CategoryOfPublisher, CommonSecurityAdvisoryFramework, DocumentLevelMetaData, Publisher,
-        Revision, Tracking,
-    };
+    use crate::csaf::csaf2_1::schema::{CategoryOfPublisher, CommonSecurityAdvisoryFramework, DocumentLevelMetaData, JsonSchema, LabelOfTlp, Publisher, Revision, RulesForSharingDocument, Tracking, TrafficLightProtocolTlp};
 
     fn mock_document() -> CommonSecurityAdvisoryFramework {
         let metadata: DocumentLevelMetaData = DocumentLevelMetaData::builder()
             .title("Test")
             .category("csaf_base")
             .csaf_version("2.1")
+            .distribution(
+                RulesForSharingDocument::builder()
+                    .tlp(
+                        TrafficLightProtocolTlp::builder()
+                            .label(LabelOfTlp::Clear)
+                    )
+            )
+
             .publisher(
                 Publisher::builder()
                     .category(CategoryOfPublisher::Coordinator)
@@ -51,6 +56,7 @@ mod tests {
             .unwrap();
         CommonSecurityAdvisoryFramework::builder()
             .document(metadata)
+            .schema(JsonSchema::HttpsDocsOasisOpenOrgCsafCsafV21CsafJsonSchemaJson)
             .try_into()
             .unwrap()
     }