tests: extend/revisit example for expression-details

jkowalleck · jkowalleck · commit cebcf7dcd209 · 2025-02-21T15:59:06.000+01:00
Signed-off-by: Jan Kowalleck &lt;jan.kowalleck@gmail.com&gt;
diff --git a/tools/src/test/resources/1.7/valid-license-expression-with-text-1.7.json b/tools/src/test/resources/1.7/valid-license-expression-with-text-1.7.json
@@ -36,14 +36,15 @@
           "bom-ref": "my-license",
           "acknowledgement": "declared",
           "expression": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
-          "expression-details": {
+          "expressionDetails": {
             "texts": [
               {
-                "license-identifier": "EPL-2.0",
+                "licenseIdentifier": "EPL-2.0",
                 "content": "Eclipse Public License - v 2.0\n\n    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE\n    PUBLIC LICENSE (\"AGREEMENT\"). ANY USE, REPRODUCTION OR DISTRIBUTION\n    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT..."
               },
               {
-                "license-identifier": "GPL-2.0 WITH Classpath-exception-2.0",
+                "licenseIdentifier": "GPL-2.0 WITH Classpath-exception-2.0",
+                "contentType": "text/plain",
                 "content": "                    GNU GENERAL PUBLIC LICENSE\n                       Version 2, June 1991\n\n Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\n <https://fsf.org/>\n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed...\n\n...\n\nLinking this library statically or dynamically with other modules is making a combined work based on this library..."
               }
             ]
diff --git a/tools/src/test/resources/1.7/valid-license-expression-with-text-1.7.textproto b/tools/src/test/resources/1.7/valid-license-expression-with-text-1.7.textproto
@@ -35,11 +35,11 @@ components {
     expression_details {
       texts {
         license_identifier: "EPL-2.0"
-
         content: "Eclipse Public License - v 2.0\n\n    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE\n    PUBLIC LICENSE (\"AGREEMENT\"). ANY USE, REPRODUCTION OR DISTRIBUTION\n    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT..."
       }
       texts {
         license_identifier: "GPL-2.0 WITH Classpath-exception-2.0",
+        content_type: "text/plain",
         content: "                    GNU GENERAL PUBLIC LICENSE\n                       Version 2, June 1991\n\n Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\n <https://fsf.org/>\n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed...\n\n...\n\nLinking this library statically or dynamically with other modules is making a combined work based on this library..."
       }
     }
diff --git a/tools/src/test/resources/1.7/valid-license-expression-with-text-1.7.xml b/tools/src/test/resources/1.7/valid-license-expression-with-text-1.7.xml
@@ -23,7 +23,9 @@
     THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
     PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
     OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT...]]]></text>
-                    <text license-identifier="GPL-2.0 WITH Classpath-exception-2.0"><![CDATA[                    GNU GENERAL PUBLIC LICENSE
+                    <text license-identifier="GPL-2.0 WITH Classpath-exception-2.0"
+                          content-type="text/plain"
+                    ><![CDATA[                    GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
diff --git a/tools/src/test/resources/1.7/valid-license-id-with-text-1.7.json b/tools/src/test/resources/1.7/valid-license-id-with-text-1.7.json
@@ -38,6 +38,7 @@
             "acknowledgement": "declared",
             "bom-ref": "my-license",
             "text": {
+              "contentType": "text/plain",
               "content": "\n                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION..."
             }
           }
diff --git a/tools/src/test/resources/1.7/valid-license-id-with-text-1.7.textproto b/tools/src/test/resources/1.7/valid-license-id-with-text-1.7.textproto
@@ -34,12 +34,8 @@ components {
       acknowledgement: LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED
       bom_ref: "my-license"
       text {
-        value: """
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-        TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION..."""
+        content_type: "text/plain",
+        value: "\n                                 Apache License\n                           Version 2.0, January 2004\n                        http://www.apache.org/licenses/\n\n   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION..."
       }
     }
   }
diff --git a/tools/src/test/resources/1.7/valid-license-id-with-text-1.7.xml b/tools/src/test/resources/1.7/valid-license-id-with-text-1.7.xml
@@ -17,7 +17,7 @@
             <licenses>
                 <license bom-ref="my-license" acknowledgement="declared">
                     <id>Apache-2.0</id>
-                    <text><![CDATA[
+                    <text content-type="text/plain"><![CDATA[
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
diff --git a/tools/src/test/resources/1.7/valid-license-name-with-text-1.7.json b/tools/src/test/resources/1.7/valid-license-name-with-text-1.7.json
@@ -38,6 +38,7 @@
             "bom-ref": "my-license",
             "acknowledgement": "declared",
             "text": {
+              "contentType": "text/plain",
               "content": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec turpis efficitur, ullamcorper lorem ac, fermentum nulla. Mauris a enim nunc. Aliquam diam tellus, porttitor venenatis leo in, mollis ultricies lacus. Sed sagittis hendrerit nulla, eget pulvinar diam..."
             }
           }
diff --git a/tools/src/test/resources/1.7/valid-license-name-with-text-1.7.textproto b/tools/src/test/resources/1.7/valid-license-name-with-text-1.7.textproto
@@ -34,6 +34,7 @@ components {
       bom_ref: "my-license"
       acknowledgement: LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED
       text {
+        content_type: "text/plain",
         value: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec turpis efficitur, ullamcorper lorem ac, fermentum nulla. Mauris a enim nunc. Aliquam diam tellus, porttitor venenatis leo in, mollis ultricies lacus. Sed sagittis hendrerit nulla, eget pulvinar diam..."
       }
     }
diff --git a/tools/src/test/resources/1.7/valid-license-name-with-text-1.7.xml b/tools/src/test/resources/1.7/valid-license-name-with-text-1.7.xml
@@ -17,7 +17,7 @@
             <licenses>
                 <license bom-ref="my-license" acknowledgement="declared">
                     <name>My License</name>
-                    <text><![CDATA[Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec turpis efficitur, ullamcorper lorem ac, fermentum nulla. Mauris a enim nunc. Aliquam diam tellus, porttitor venenatis leo in, mollis ultricies lacus. Sed sagittis hendrerit nulla, eget pulvinar diam...]]></text>
+                    <text content-type="text/plain"><![CDATA[Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec turpis efficitur, ullamcorper lorem ac, fermentum nulla. Mauris a enim nunc. Aliquam diam tellus, porttitor venenatis leo in, mollis ultricies lacus. Sed sagittis hendrerit nulla, eget pulvinar diam...]]></text>
                 </license>
             </licenses>
             <purl>pkg:maven/com.acme/tomcat-catalina@9.0.14?packaging=jar</purl>

Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,15 @@`
`36`	`36`	`"bom-ref": "my-license",`
`37`	`37`	`"acknowledgement": "declared",`
`38`	`38`	`"expression": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",`
`39`		`- "expression-details": {`
	`39`	`+ "expressionDetails": {`
`40`	`40`	`"texts": [`
`41`	`41`	`{`
`42`		`- "license-identifier": "EPL-2.0",`
	`42`	`+ "licenseIdentifier": "EPL-2.0",`
`43`	`43`	`"content": "Eclipse Public License - v 2.0\n\n THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE\n PUBLIC LICENSE (\"AGREEMENT\"). ANY USE, REPRODUCTION OR DISTRIBUTION\n OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT..."`
`44`	`44`	`},`
`45`	`45`	`{`
`46`		`- "license-identifier": "GPL-2.0 WITH Classpath-exception-2.0",`
	`46`	`+ "licenseIdentifier": "GPL-2.0 WITH Classpath-exception-2.0",`
	`47`	`+ "contentType": "text/plain",`
`47`	`48`	`"content": " GNU GENERAL PUBLIC LICENSE\n Version 2, June 1991\n\n Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\n <https://fsf.org/>\n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed...\n\n...\n\nLinking this library statically or dynamically with other modules is making a combined work based on this library..."`
`48`	`49`	`}`
`49`	`50`	`]`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,11 @@ components {`
`35`	`35`	`expression_details {`
`36`	`36`	`texts {`
`37`	`37`	`license_identifier: "EPL-2.0"`
`38`		`-`
`39`	`38`	`content: "Eclipse Public License - v 2.0\n\n THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE\n PUBLIC LICENSE (\"AGREEMENT\"). ANY USE, REPRODUCTION OR DISTRIBUTION\n OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT..."`
`40`	`39`	`}`
`41`	`40`	`texts {`
`42`	`41`	`license_identifier: "GPL-2.0 WITH Classpath-exception-2.0",`
	`42`	`+ content_type: "text/plain",`
`43`	`43`	`content: " GNU GENERAL PUBLIC LICENSE\n Version 2, June 1991\n\n Copyright (C) 1989, 1991 Free Software Foundation, Inc.,\n <https://fsf.org/>\n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed...\n\n...\n\nLinking this library statically or dynamically with other modules is making a combined work based on this library..."`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@`
`38`	`38`	`"acknowledgement": "declared",`
`39`	`39`	`"bom-ref": "my-license",`
`40`	`40`	`"text": {`
	`41`	`+ "contentType": "text/plain",`
`41`	`42`	`"content": "\n Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION..."`
`42`	`43`	`}`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,8 @@ components {`
`34`	`34`	`acknowledgement: LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED`
`35`	`35`	`bom_ref: "my-license"`
`36`	`36`	`text {`
`37`		`- value: """`
`38`		`- Apache License`
`39`		`- Version 2.0, January 2004`
`40`		`- http://www.apache.org/licenses/`
`41`		`-`
`42`		`- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION..."""`
	`37`	`+ content_type: "text/plain",`
	`38`	`+ value: "\n Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION..."`
`43`	`39`	`}`
`44`	`40`	`}`
`45`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ components {`
`34`	`34`	`bom_ref: "my-license"`
`35`	`35`	`acknowledgement: LICENSE_ACKNOWLEDGEMENT_ENUMERATION_DECLARED`
`36`	`36`	`text {`
	`37`	`+ content_type: "text/plain",`
`37`	`38`	`value: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus nec turpis efficitur, ullamcorper lorem ac, fermentum nulla. Mauris a enim nunc. Aliquam diam tellus, porttitor venenatis leo in, mollis ultricies lacus. Sed sagittis hendrerit nulla, eget pulvinar diam..."`
`38`	`39`	`}`
`39`	`40`	`}`