From c2dcce9aedc0daa613690856c9a43d74f879daab Mon Sep 17 00:00:00 2001
From: Jan Kowalleck <jan.kowalleck@gmail.com>
Date: Wed, 22 Jan 2025 10:37:51 +0100
Subject: [PATCH] tests

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
---
 .../1.7/valid-license-choice-1.7.json         | 36 +++++++++++++++++++
 .../1.7/valid-license-choice-1.7.textproto    | 34 ++++++++++++++++++
 ...e-1.7.xml => valid-license-choice-1.7.xml} | 15 ++++----
 3 files changed, 78 insertions(+), 7 deletions(-)
 create mode 100644 tools/src/test/resources/1.7/valid-license-choice-1.7.json
 create mode 100644 tools/src/test/resources/1.7/valid-license-choice-1.7.textproto
 rename tools/src/test/resources/1.7/{invalid-license-choice-1.7.xml => valid-license-choice-1.7.xml} (53%)

diff --git a/tools/src/test/resources/1.7/valid-license-choice-1.7.json b/tools/src/test/resources/1.7/valid-license-choice-1.7.json
new file mode 100644
index 00000000..a7026109
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-choice-1.7.json
@@ -0,0 +1,36 @@
+{
+  "$schema": "http://cyclonedx.org/schema/bom-1.7.schema.json",
+  "bomFormat": "CycloneDX",
+  "specVersion": "1.7",
+  "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+  "version": 1,
+  "components": [
+    {
+      "type": "application",
+      "publisher": "Acme Inc",
+      "group": "com.acme",
+      "name": "tomcat-catalina",
+      "version": "9.0.14",
+      "description": "Modified version of Apache Catalina",
+      "scope": "required",
+      "licenses": [
+        {
+          "license": {
+            "id": "Apache-2.0"
+          }
+        },
+        {
+          "expression": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0"
+        },
+        {
+          "license": {
+            "name": "My Own License",
+            "text": {
+              "content": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/tools/src/test/resources/1.7/valid-license-choice-1.7.textproto b/tools/src/test/resources/1.7/valid-license-choice-1.7.textproto
new file mode 100644
index 00000000..f70f6a46
--- /dev/null
+++ b/tools/src/test/resources/1.7/valid-license-choice-1.7.textproto
@@ -0,0 +1,34 @@
+# proto-file: schema/bom-1.7.proto
+# proto-message: Bom
+
+# All license posture in here is for show-case ony.
+# This is not a real law-case!
+
+spec_version: "1.7"
+serial_number: "urn:uuid:b1ef52c6-7cd8-43d5-9e42-5e69044bbe9e"
+version: 1
+components {
+  type: CLASSIFICATION_APPLICATION
+  publisher: "Acme Inc"
+  group: "com.acme"
+  name: "tomcat-catalina"
+  version: "9.0.14"
+  description: "Modified version of Apache Catalina"
+  scope: SCOPE_REQUIRED
+  licenses {
+    license: {
+      id: "Apache-2.0"
+    }
+  }
+  licenses {
+    expression: "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0"
+  }
+  licenses {
+    license: {
+      name:  "My Own License"
+      text: {
+        value: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+      }
+    }
+  }
+}
diff --git a/tools/src/test/resources/1.7/invalid-license-choice-1.7.xml b/tools/src/test/resources/1.7/valid-license-choice-1.7.xml
similarity index 53%
rename from tools/src/test/resources/1.7/invalid-license-choice-1.7.xml
rename to tools/src/test/resources/1.7/valid-license-choice-1.7.xml
index fec014d5..1947c9a2 100644
--- a/tools/src/test/resources/1.7/invalid-license-choice-1.7.xml
+++ b/tools/src/test/resources/1.7/valid-license-choice-1.7.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
-<bom serialNumber="urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79" version="1" xmlns="http://cyclonedx.org/schema/bom/1.7">
+<bom xmlns="http://cyclonedx.org/schema/bom/1.7"
+     serialNumber="urn:uuid:b1ef52c6-7cd8-43d5-9e42-5e69044bbe9e"
+     version="1"
+>
     <components>
         <component type="application">
             <publisher>Acme Inc</publisher>
@@ -8,17 +11,15 @@
             <version>9.0.14</version>
             <description>Modified version of Apache Catalina</description>
             <scope>required</scope>
-            <hashes>
-                <hash alg="MD5">3942447fac867ae5cdb3229b658f4d48</hash>
-                <hash alg="SHA-1">e6b1000b94e835ffd37f4c6dcbdad43f4b48a02a</hash>
-                <hash alg="SHA-256">f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b</hash>
-                <hash alg="SHA-512">e8f33e424f3f4ed6db76a482fde1a5298970e442c531729119e37991884bdffab4f9426b7ee11fccd074eeda0634d71697d6f88a460dce0ac8d627a29f7d1282</hash>
-            </hashes>
             <licenses>
                 <license>
                     <id>Apache-2.0</id>
                 </license>
                 <expression>EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0</expression>
+                <license>
+                    <name>My Own License</name>
+                    <text><![CDATA[Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.]]></text>
+                </license>
             </licenses>
             <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>
         </component>